diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 467195f9ea63..91e9a971200e 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,4 +1,4 @@
DIST httpd-2.2.27.tar.bz2 5616798 SHA256 205973ded6ca55c056ce9c84d73ab708f7829f330193bd39b651463b8d4f8147 SHA512 b318c157392e5c602d42eb52c8d7f1bd7258c817756fd20dcec8a8a177af3e42db4e25891473646c293ace42bc5d5608de083a14878ed446b8559709492bbf1d WHIRLPOOL c80c56d511586c87d6eb41eb8f5c00317d101b7532b127d50531409f4068aceba1022b16cf2ab122d91edcd9552fcae8543e8a31fbab78564dcd2e057b29e0f1
DIST httpd-2.2.29.tar.bz2 5625498 SHA256 574b4f994b99178dfd5160bcb14025402e2ce381be9889b83e4be0ffbf5839a4 SHA512 0b953c97d79dfaaedaee72c6260e7a8e2e1711d47b19f9ace961b33f1226eeb58e37e04694a3e1207e0cf151a9ffbebf379d2bb81306bbf5111ec6db621a68b8 WHIRLPOOL d161104824c5bd6a42675489facf528a8ac2e727a8d2a295111b182e73bb17e7e8a52b720e74a37371e8bd3ddf5745afea32b32171831d95870daa440e7ac2a7
DIST httpd-2.4.10.tar.bz2 5031834 SHA256 176c4dac1a745f07b7b91e7f4fd48f9c48049fa6f088efe758d61d9738669c6a SHA512 e251f5b330da17a8920c589b9e0326d6dd45db28923167718db27b0af2edf769607e9ae6fbb859afbf0c345937fd59053423a2d74bd18ff2272a0f6a19a6496f WHIRLPOOL c9f81296052a61483ceef4ae4b4c467cf64a4035030472dc8c17355f572a4887ddc6179ade2a764a4e3f0cd4ab7cc34a3fa36577a148c3df7b8d44a5f1f0424d
-DIST httpd-2.4.9.tar.bz2 4994460 SHA256 f78cc90dfa47caf3d83ad18fd6b4e85f237777c1733fc9088594b70ce2847603 SHA512 3a66302e18a2d165b3851665dc73be7d3849fc3359c1ff9dd9e2eaebf1f1d8fb89b7b0a05929d6247750bf0ed1abf9cf3c236a373b2d99635c8ca41698719c96 WHIRLPOOL 735677695d3b1497d554dd3e8d97733359140f3bb524335ab474275ca2b5546ceab8f5f3778948fabee2d152bf5b096d99b3dabb1011a4b68905c7cd5012a648
+DIST httpd-2.4.12.tar.bz2 5054838 SHA256 ad6d39edfe4621d8cc9a2791f6f8d6876943a9da41ac8533d77407a2e630eae4 SHA512 f69db14b421f0e1e4861fe4d8b652688d50ca9eb41c622242d11ae55687eb6c2142a8505a8c3fb6f2bd53167be535bc0a77ca1af97e0720930fc7f20f4c1f8e8 WHIRLPOOL 56512066e8978c4a3d47d0cc2bb92093fd468a9b2f46b8b07fe4db366f55fa5e74ae58bbebe2377cbe0c66f1585759115c786f62f18ac1abc534fb257689d250
diff --git a/app-admin/apache-tools/apache-tools-2.4.9-r1.ebuild b/app-admin/apache-tools/apache-tools-2.4.12.ebuild
similarity index 95%
rename from app-admin/apache-tools/apache-tools-2.4.9-r1.ebuild
rename to app-admin/apache-tools/apache-tools-2.4.12.ebuild
index e177e199823a..4ee45329068c 100644
--- a/app-admin/apache-tools/apache-tools-2.4.9-r1.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.4.9-r1.ebuild,v 1.1 2014/05/22 14:01:25 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.4.12.ebuild,v 1.1 2015/02/04 18:17:34 polynomial-c Exp $
EAPI=5
inherit flag-o-matic eutils multilib toolchain-funcs
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 8b10363cbef5..f133d1b34e94 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,8 +1,7 @@
DIST mysql-5.5.40.tar.gz 21727672 SHA256 4d3721761a31c28866e8ee0fde47558a3e9047aaef3b89135ae8d45eebb74960 SHA512 9adc3c0ace48a84ee87fb7e1f36b2f3d3e5cd95d50ca3012828c7fb33b723cfbfdf85760a30ea38c719a90cc449613747e974768b7f0b070dc346e05a5c418b3 WHIRLPOOL e8a5e8c6e4b816d935fd5368a9f38eaea23b1269c39e6ceed54c13bfaa85586ea81d1c4386f4f3d520cdb3d16b023afa3dab763629e388bc0759389e0eddec43
DIST mysql-5.5.41.tar.gz 21768300 SHA256 ec642fc5be5ea03b24a0c5189204675fb3794dee772314ace650623c1c994844 SHA512 4c4e9658175e1f5de218527045d7d43f880a16c0069725e6c9f9873538b5ede39e4024fc9983e42c04d59a7bece7a3505d154eabbaa230c0dd456c46ff4982b8 WHIRLPOOL 37ef2709b489db62beb745d3b39bf6e6ebe97e98ea6f5630fa4a74cf865d048a222b19995eff71c6146b15cb28f4dd7edf1567ddf6dbef606f964149dad37ccc
-DIST mysql-5.6.21.tar.gz 33009070 SHA256 ea4daf6a8f4b1a9c62e416249a08fbdcbf686667d738004ef82044def96feb7c SHA512 0a15c30d17324eb123d7953a2564fea43a3d288dfe098dc419096c40101f8ee2fe201dab1a4860158b72a259040cab7a45073576a1a24879b1e1dc9990c190bd WHIRLPOOL 8a00b0fe04df901aece356f979e29b47c4361fa5e14ec76c36e0bc43da4049de265b547f9a27b6c948d5989c04a784c6dca547e86cc380bbb57d477b614f8e31
DIST mysql-5.6.22.tar.gz 33115516 SHA256 c4d2dfabb20a8e26e8437dff41f366520001eb031ffd77fbfcde70d0073fc9f6 SHA512 11b4a1b34ff4bb63d7cdbc1134947772b2c30715b1e3d3fba2ed9c5102f0bde14a708561b2d463014eca64f5fb415a54a0e1656d48f118b403e66d83b98f5b82 WHIRLPOOL a85db903ce1bc542ac87d832d2d0d84cd4c8a75f5feae435d0a9c5ce26f792b7d30c0113764315e8df0e74a899ee2c02233e3b193b42a98daf46ed52b5ccc9cd
+DIST mysql-5.6.23.tar.gz 33115859 SHA256 3bd21af06a9304e372daba41fa5612bb54ac1bc05a4349b3160d0cda972ac098 SHA512 ac648550934ac6ddcb0cbc93731c2d913288dff53ada665f161d14c46e16f2a8ad8d09106a2718e8412f859ea9cf038d04e4c6f5fbea6e4424f9373ddccf4da3 WHIRLPOOL ae315cc7a60408cc050a7941b3c16cf169554b5a67fe4ce23a9b183cb551168f2ec3817e28cf0aa24b619ddc1b638bd926cfcf9c2e0755b2acbf1b82548b2581
DIST mysql-extras-20140801-1950Z.tar.bz2 1494288 SHA256 a656486a7383d656ed33e279f41bb4384feba082cad3af48376ce9e1f395fe0b SHA512 b2c29c3d7c1ddacfa170125c9df0aaf65eac9f6112244b1deea97a46a3a2f2bd3eb069808e7b2ee3261d609b32046363830ba4ebcc7e74f449189a91145a6f9c WHIRLPOOL 41befc03a7382516849ecaecc1d02be7d00c47be489b97ce68c320c3aa8979c8f941525efe230d97ad2d1a85936a1e4d6c93d96a3f45930991a938e5f0fdab87
-DIST mysql-extras-20141019-1948Z.tar.bz2 1494569 SHA256 9a2ced701ef613e2a41c9a1fc550d9004d04f52cbfc06bb634ba9284d7a1c0ea SHA512 c9e3f3a447f010be0563b9d9ee2937d32c5334b04a883218eb6c14af41f9de635c3c0c44128959793e8a12ca3b26b2415777a13aced7c3812ab2c6d21ade6799 WHIRLPOOL bc0c73ca86d59d18a76a047a920fc2f64d2b3246e6b64838127d26c5c55cb3fc1ce8833656f5eadba72ef651e1f6c3e75700f776a1205ab33ab6ee0064851b86
DIST mysql-extras-20141203-2105Z.tar.bz2 1494317 SHA256 cec9fe6873563840e9520ec9f02d06e1262748847be45a9aeaaa841f7ed4b4dc SHA512 958b410d7905d7911a69288ba9a9ebb1d80ff38281506e18400652b15895eb3926d9679fd245a54f4f7cdb688ed9940f21b1b4634239dbc1a1db19ac3918921a WHIRLPOOL baf70684826f393723bd3877813d9415c15b847ffd71757535a12106bff4fcf343cca37e166d45be06eca0425d249dc600bc752ab5e27e02ead3897952ceb169
DIST mysql-extras-20150127-1351Z.tar.bz2 1494648 SHA256 74497659f1fb3b0cb620e38a911cf2e59a084149dd175199eb7cf4be18b4c328 SHA512 886e42697b3b0a90d8542bafaf3a7ccedf075f9f0065fec995bf58f645edff3a5d62f29be1cfa2e01d002d6382ee02279832cea8c21db6a774c2567c75ab6a35 WHIRLPOOL 9ddb5ccd914a6a6a19741ff93df78534d2273cf918f24af427c018b7c4f424a90d9f57f167633c48e2fa4102a4fae0873fd6dec7529839f229af855cbddf82d4
diff --git a/dev-db/mysql/mysql-5.6.21-r1.ebuild b/dev-db/mysql/mysql-5.6.21-r1.ebuild
deleted file mode 100644
index 8b10fb117af4..000000000000
--- a/dev-db/mysql/mysql-5.6.21-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.21-r1.ebuild,v 1.2 2014/12/02 18:18:11 grknight Exp $
-
-EAPI="5"
-
-MY_EXTRAS_VER="20141019-1948Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-inherit toolchain-funcs mysql-multilib
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='-cluster embedded extraengine perl ssl static-libs community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-multilib_src_test() {
-
- if ! multilib_is_native_abi ; then
- einfo "Server tests not available on non-native abi".
- return 0;
- fi
-
- local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
- local retstatus_unit
- local retstatus_tests
-
- # Bug #213475 - MySQL _will_ object strenously if your machine is named
- # localhost. Also causes weird failures.
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
- if ! use "minimal" ; then
-
- if [[ $UID -eq 0 ]]; then
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
- fi
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Run CTest (test-units)
- cmake-utils_src_test
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
- # Enable parallel testing, auto will try to detect number of cores
- # You may set this by hand.
- # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
- export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
- # create directories because mysqladmin might right out of order
- mkdir -p "${T}"/var-tests{,/log}
-
- # create symlink for the tests to find mysql_tzinfo_to_sql
- ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
-
- # These are failing in MySQL 5.5/5.6 for now and are believed to be
- # false positives:
- #
- # main.information_schema, binlog.binlog_statement_insert_delayed,
- # funcs_1.is_triggers funcs_1.is_tables_mysql,
- # funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
- # perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
- # mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
- # perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # rpl.rpl_plugin_load
- # fails due to included file not listed in expected result
- # appears to be poor planning
- for t in \
- binlog.binlog_mysqlbinlog_filter \
- binlog.binlog_statement_insert_delayed \
- funcs_1.is_columns_mysql \
- funcs_1.is_tables_mysql \
- funcs_1.is_triggers \
- main.information_schema \
- main.mysql_client_test \
- main.mysqld--help-notwin \
- perfschema.binlog_edge_mix \
- perfschema.binlog_edge_stmt \
- rpl.rpl_plugin_load \
- ; do
- mysql-multilib_disable_test "$t" "False positives in Gentoo"
- done
-
- # Run mysql tests
- pushd "${TESTDIR}"
-
- # Set file limits higher so tests run
- ulimit -n 3000
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
- --suite-timeout=5000
- retstatus_tests=$?
- [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- popd
-
- # Cleanup is important for these testcases.
- pkill -9 -f "${S}/ndb" 2>/dev/null
- pkill -9 -f "${S}/sql" 2>/dev/null
-
- failures=""
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- [[ -z "$failures" ]] || die "Test failures: $failures"
- einfo "Tests successfully completed"
-
- else
-
- einfo "Skipping server tests due to minimal build."
- fi
-}
diff --git a/dev-db/mysql/mysql-5.6.22-r1.ebuild b/dev-db/mysql/mysql-5.6.23.ebuild
similarity index 97%
rename from dev-db/mysql/mysql-5.6.22-r1.ebuild
rename to dev-db/mysql/mysql-5.6.23.ebuild
index 395d41fa3315..f2e172e69530 100644
--- a/dev-db/mysql/mysql-5.6.22-r1.ebuild
+++ b/dev-db/mysql/mysql-5.6.23.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.22-r1.ebuild,v 1.1 2015/01/28 19:44:29 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.23.ebuild,v 1.1 2015/02/04 18:30:31 grknight Exp $
EAPI="5"
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index b721a8b55cb9..d346c05ff87e 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1 +1,3 @@
DIST libinput-0.7.0.tar.xz 440228 SHA256 129f485afe5e4a9394641293991c97cb99f5f3338340d0d65b704ff463d1579e SHA512 0e03ab7ca98c4574997742b7d8912000fb176d7a3e2c381b7e63139f78455374f8f38284e226fe443d5a524f34be8995317b91fc0190795a97b10af060423b77 WHIRLPOOL 664510fc33cb718b56600553332bb3eb587b3f4a40f81d4a80dd218882aba204522bcbbfab98f3ae0c6447d3a39cc98b9d88aea5f8e3c21da0803b93d64ad321
+DIST libinput-0.8.0.tar.xz 504908 SHA256 57747436ac6a2ed9fe7745093acdd96fdce699bad6074c6e89450367d74192c7 SHA512 f913d48f1badf4fca98384382ab6d84d5b9e49d4130cdf1073fa89b49b8bcb1c313f82b2728513a77433e4020645a10dbcc0511f87e9d2e1316c5f1d1126e9ae WHIRLPOOL 2c92c9d1ff3cd9940390399b1abba40a953cbf6cb49c10df66e3d073f14905603ec98589d61d5ff74f613a6a67c678646ae724d12633b740bbe37340e4fa6568
+DIST libinput-0.9.0.tar.xz 510512 SHA256 309043976f41f5451c2a4b1c25bc2993b18aecb22524d797f21eb6b6c968ff0d SHA512 a6f718215428eda45ac00c25d0b62ada84bf924822cb66e0a9b28f4cfc36e7d1678f2dfb47afae16ce4c277d589adcf97aefe8e2e5a154873b649fe4a84527a1 WHIRLPOOL 23da6dbcd7b17000cea641e0931db8a9b2ad34b0655e4e31b0419ff4799adc59d2646b10316e073ad49695ebd652c150abf05c39d15c735ecb1d97f6f8c1d8de
diff --git a/dev-libs/libinput/libinput-0.8.0.ebuild b/dev-libs/libinput/libinput-0.8.0.ebuild
new file mode 100644
index 000000000000..4e0c6a15df34
--- /dev/null
+++ b/dev-libs/libinput/libinput-0.8.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libinput/libinput-0.8.0.ebuild,v 1.1 2015/02/04 16:13:02 chithanh Exp $
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/libinput/"
+SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+# License appears to be a variant of libtiff
+LICENSE="libtiff"
+SLOT="0/7"
+KEYWORDS="~amd64 ~arm"
+IUSE="test"
+
+RDEPEND="
+ >=dev-libs/libevdev-0.4
+ >=sys-libs/mtdev-1.1
+ virtual/libudev
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ test? ( >=dev-libs/check-0.9.10 )
+"
+# tests can even use: dev-util/valgrind
+
+src_configure() {
+ # Doc handling in kinda strange but everything
+ # is available in the tarball already.
+ sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
+ -i Makefile.am Makefile.in || die
+}
+
+src_configure() {
+ # gui can be built but will not be installed
+ # building documentation silently fails with graphviz syntax errors
+ econf \
+ --disable-documentation \
+ --disable-event-gui \
+ $(use_enable test tests)
+}
+
+src_install() {
+ emake install DESTDIR="${D}" || die
+ dodoc -r doc/html
+ prune_libtool_files
+}
diff --git a/dev-libs/libinput/libinput-0.9.0.ebuild b/dev-libs/libinput/libinput-0.9.0.ebuild
new file mode 100644
index 000000000000..a34e99556694
--- /dev/null
+++ b/dev-libs/libinput/libinput-0.9.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libinput/libinput-0.9.0.ebuild,v 1.1 2015/02/04 16:15:54 chithanh Exp $
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/libinput/"
+SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+# License appears to be a variant of libtiff
+LICENSE="libtiff"
+SLOT="0/7"
+KEYWORDS="~amd64 ~arm"
+IUSE="test"
+
+RDEPEND="
+ >=dev-libs/libevdev-0.4
+ >=sys-libs/mtdev-1.1
+ virtual/libudev
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ test? ( >=dev-libs/check-0.9.10 )
+"
+# tests can even use: dev-util/valgrind
+
+src_configure() {
+ # Doc handling in kinda strange but everything
+ # is available in the tarball already.
+ sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
+ -i Makefile.am Makefile.in || die
+}
+
+src_configure() {
+ # gui can be built but will not be installed
+ # building documentation silently fails with graphviz syntax errors
+ econf \
+ --disable-documentation \
+ --disable-event-gui \
+ $(use_enable test tests)
+}
+
+src_install() {
+ emake install DESTDIR="${D}" || die
+ dodoc -r doc/html
+ prune_libtool_files
+}
diff --git a/dev-libs/libinput/metadata.xml b/dev-libs/libinput/metadata.xml
index da6fd63d0085..42473bf06aa3 100644
--- a/dev-libs/libinput/metadata.xml
+++ b/dev-libs/libinput/metadata.xml
@@ -2,4 +2,5 @@
gnome
+x11
diff --git a/dev-python/enum34/enum34-1.0.4.ebuild b/dev-python/enum34/enum34-1.0.4.ebuild
index 39223ca0b427..1fd973204704 100644
--- a/dev-python/enum34/enum34-1.0.4.ebuild
+++ b/dev-python/enum34/enum34-1.0.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/enum34/enum34-1.0.4.ebuild,v 1.8 2015/01/23 21:28:23 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/enum34/enum34-1.0.4.ebuild,v 1.9 2015/02/04 16:11:42 haubi Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3} pypy pypy3 ) # Do NOT add python3_4—see DESCRIPTION
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~x86 ~amd64-linux ~x86-macos"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="doc"
DEPEND=""
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.3.2.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.3.2.ebuild
index 646d5e5c663d..b98ad7cf02e0 100644
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.3.2.ebuild
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ndg-httpsclient/ndg-httpsclient-0.3.2.ebuild,v 1.19 2014/09/24 09:33:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ndg-httpsclient/ndg-httpsclient-0.3.2.ebuild,v 1.20 2015/02/04 16:13:47 haubi Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE=""
RDEPEND="dev-python/pyopenssl[${PYTHON_USEDEP}]"
diff --git a/dev-python/sepolgen/Manifest b/dev-python/sepolgen/Manifest
index 103ddf66b78a..d8ca42aecf1e 100644
--- a/dev-python/sepolgen/Manifest
+++ b/dev-python/sepolgen/Manifest
@@ -2,3 +2,4 @@ DIST patchbundle-sepolgen-1.2.1-r1.tar.gz 762 SHA256 f6c83b003df65cd2a11c689cb8a
DIST sepolgen-1.2.1.tar.gz 366214 SHA256 438c246bdc6b3cf1b12116831f4c601aaae6e93decb007dddab212a3c88781b0 SHA512 ec71126eaf6ecb18d989821753c04f3325de2188bafe161deff5733ebb95c3589e06198666f0502169cfa7d3a2b8ec509ff62098dc11b66b4f0883e1d8703a6e WHIRLPOOL efdbbb9771f68921a5fd3824267c7716ca48ab1f40395aea5c27ac4f7f3b8bf71f718da5ada40eed6c1b2de5341f3d5f10c7ad6086b5ac017d4898136ded6fe0
DIST sepolgen-1.2.2-rc6.tar.gz 366364 SHA256 b2dd51e6a0252505a120c2f80baa72848fd0478077894404c6b4a4d2536e96c6 SHA512 3c6b1fd51967b92bf2a36049ae65daa3647a5d2e101ab38b201c8bcfabd76101846812e8ee7a6edf5d7be34d881dc792e58b1ae32de088e8805e5c9f85776a38 WHIRLPOOL 864ee219e8a45abf5a003c8c33b008d4ba2eab2e48bcc895e760888d40720f7b37662bb46f32f8720eadc0817f7ea50a54286e16214c927f591c8c3a94d07eae
DIST sepolgen-1.2.2-rc7.tar.gz 366368 SHA256 f7262aa6fb1d391f90b412b04b186ce1cb27dcf9722f07a8c967f1fa231396b1 SHA512 4e782ed9d37ffb17d7bd6e9545d2565b09f92d7619487bbc1e916cde99b69000c5853cb77d395767bb6fc1d0002d56d51cfe950169e88bdfb8e8d5f299dba80f WHIRLPOOL 251d9a247d78351719adff7181d7849cc229ac802bd4c13a393c37b8d816a534d8b698bdb6919808d2020b5546a196a4a826cbb27c4cf41469a5c4376697d2c7
+DIST sepolgen-1.2.2.tar.gz 366343 SHA256 bebda8eeb2d386d26823d724ea320508a02b50828d44aff47c3f907cf54c2324 SHA512 83d56c31a87da8e271d6f436878a61f21c508ed8e26fa71f57ef109f432b10e310520c45bdb027f89a1edae12568d827ce3159bd8b6b9cf07c572b9a7225acee WHIRLPOOL 449f540caf2aa653bf2b2638ef310d2b710503744e1387119a66d3039253f537ea7ba987b0e5887e004f76485b1ae2e4a84c192a2e0e3423c9c8e61d8bb0198b
diff --git a/dev-python/sepolgen/sepolgen-1.2.2.ebuild b/dev-python/sepolgen/sepolgen-1.2.2.ebuild
new file mode 100644
index 000000000000..305f7fec9d07
--- /dev/null
+++ b/dev-python/sepolgen/sepolgen-1.2.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.2.2.ebuild,v 1.1 2015/02/04 17:56:33 perfinion Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit python-r1 eutils
+
+MY_P="${P//_/-}"
+
+DESCRIPTION="SELinux policy generation library"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20150202/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=sys-libs/libselinux-2.0[python]
+ app-admin/setools[python]
+ ${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ epatch "${FILESDIR}/0030-default-path-for-tests-also-needed-bug-467264.patch"
+
+ epatch_user
+
+ python_copy_sources
+}
+
+src_compile() {
+ :
+}
+
+src_test() {
+ if has_version sec-policy/selinux-base-policy; then
+ invoke_sepolgen_test() {
+ emake test
+ }
+ python_foreach_impl invoke_sepolgen_test
+ else
+ ewarn "Sepolgen requires sec-policy/selinux-base-policy to run tests."
+ fi
+}
+
+src_install() {
+ installation() {
+ emake DESTDIR="${D}" PYTHONLIBDIR="$(python_get_sitedir)" install
+ python_optimize
+ }
+ python_foreach_impl installation
+
+ # Create sepolgen.conf with different devel location definition
+ if [[ -f /etc/selinux/config ]];
+ then
+ local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config);
+ mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory";
+ echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
+ else
+ local selinuxtype="${POLICY_TYPES%% *}";
+ if [[ -n "${selinuxtype}" ]];
+ then
+ echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
+ else
+ echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include:/usr/share/selinux/strict" > "${D}"/etc/selinux/sepolgen.conf;
+ fi
+ fi
+}
diff --git a/dev-python/ssl-fetch/ssl-fetch-0.3.ebuild b/dev-python/ssl-fetch/ssl-fetch-0.3.ebuild
index 739e1a6a5c33..4422edcb5a96 100644
--- a/dev-python/ssl-fetch/ssl-fetch-0.3.ebuild
+++ b/dev-python/ssl-fetch/ssl-fetch-0.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ssl-fetch/ssl-fetch-0.3.ebuild,v 1.1 2015/01/08 18:19:29 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ssl-fetch/ssl-fetch-0.3.ebuild,v 1.2 2015/02/04 16:20:12 haubi Exp $
EAPI="5"
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
DEPEND=""
diff --git a/dev-util/cgdb/cgdb-0.6.7.ebuild b/dev-util/cgdb/cgdb-0.6.7.ebuild
index 2ef3f8477041..c07cd0f15fe8 100644
--- a/dev-util/cgdb/cgdb-0.6.7.ebuild
+++ b/dev-util/cgdb/cgdb-0.6.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cgdb/cgdb-0.6.7.ebuild,v 1.5 2014/03/06 10:44:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cgdb/cgdb-0.6.7.ebuild,v 1.6 2015/02/04 16:15:13 haubi Exp $
EAPI="4"
@@ -10,7 +10,7 @@ SRC_URI="http://cgdb.me/files/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE=""
DEPEND="sys-libs/ncurses
diff --git a/games-misc/fortune-mod-bofh-excuses/Manifest b/games-misc/fortune-mod-bofh-excuses/Manifest
index 51d8a65c1fd6..45e2c6ed9db3 100644
--- a/games-misc/fortune-mod-bofh-excuses/Manifest
+++ b/games-misc/fortune-mod-bofh-excuses/Manifest
@@ -1 +1 @@
-DIST fortune-bofh-excuses-1.2.tar.gz 12753 RMD160 bbe218911d63f7052c4a6bf3b6dbf2f233d73526 SHA1 3aba7fa06e063d4059218c9b2c9c644a88a2de16 SHA256 37f7bc54bd591c71ff8df2233e9856f22d0b1357799fa7775aca2d96d2f8d4ba
+DIST fortune-bofh-excuses-1.2.tar.gz 12753 SHA256 37f7bc54bd591c71ff8df2233e9856f22d0b1357799fa7775aca2d96d2f8d4ba SHA512 71e9f664a1ceaf20455bc2c49e5efe0a953d188cbcd11e5a536fee73a01623659fbcc379baa4d8b7ac4a6970402c085a508f0e37b7fe182869c7ca9ffc2fce99 WHIRLPOOL 45749cede1c9ebcb2c135ba361fb43cef9cb467fafd8c40e2073858b4aaf06307c588439a16108b7ee1e7181df3ed83f7dede92cc661d64818d90acaa9a28ee4
diff --git a/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2.ebuild b/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2.ebuild
index c9d22109bfbe..806036980fd7 100644
--- a/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2.ebuild
+++ b/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2.ebuild,v 1.13 2010/12/12 18:28:14 grobian Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2.ebuild,v 1.14 2015/02/04 17:37:42 tupone Exp $
+EAPI=5
DESCRIPTION="Excuses from Bastard Operator from Hell"
HOMEPAGE="http://www.stlim.net/staticpages/index.php?page=20020814005536450"
SRC_URI="http://www.stlim.net/downloads/fortune-bofh-excuses-${PV}.tar.gz"
@@ -17,5 +17,5 @@ S=${WORKDIR}/${PN/mod-/}
src_install() {
insinto /usr/share/fortune
- doins bofh-excuses.dat bofh-excuses || die
+ doins bofh-excuses.dat bofh-excuses
}
diff --git a/games-misc/fortune-mod-calvin/Manifest b/games-misc/fortune-mod-calvin/Manifest
index 2ce7fa88058e..6bb11b886aac 100644
--- a/games-misc/fortune-mod-calvin/Manifest
+++ b/games-misc/fortune-mod-calvin/Manifest
@@ -1 +1 @@
-DIST fortune-mod-calvin-0.1.1.tar.gz 6787 RMD160 8ce7e7c72286189684a57ae9b308568d160a3a64 SHA1 6d13833bed7b02829dfa250328dd37b9de16b5b5 SHA256 7a914611b70a191743cff22a6eef763409d77d67852ba4563e61f0d7db2c04d9
+DIST fortune-mod-calvin-0.1.1.tar.gz 6787 SHA256 7a914611b70a191743cff22a6eef763409d77d67852ba4563e61f0d7db2c04d9 SHA512 047e9694aca702b93661ac252ca8599d6b3778116907fce93ad2b9eca79e9af497b9f2dc188223d19eff8109691cbf66248cea259786c5504446eee3cd3b8245 WHIRLPOOL aca0273b1744c7f95f99ccd0c3bca49d852cb22cc10c275d97c4002916390762f7066a00c8c8a776a76c8a8a9460d1b73e6109eaf7d50628556ce78b8b2a9c06
diff --git a/games-misc/fortune-mod-calvin/fortune-mod-calvin-0.1.1.ebuild b/games-misc/fortune-mod-calvin/fortune-mod-calvin-0.1.1.ebuild
index 7621f51e49ce..56d3602d152f 100644
--- a/games-misc/fortune-mod-calvin/fortune-mod-calvin-0.1.1.ebuild
+++ b/games-misc/fortune-mod-calvin/fortune-mod-calvin-0.1.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-calvin/fortune-mod-calvin-0.1.1.ebuild,v 1.14 2010/12/12 18:23:23 grobian Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-calvin/fortune-mod-calvin-0.1.1.ebuild,v 1.15 2015/02/04 17:39:28 tupone Exp $
+EAPI=5
DESCRIPTION="Quotes from Calvin and Hobbes Comic Books"
HOMEPAGE="http://www.netmeister.org/misc.html"
SRC_URI="http://www.netmeister.org/apps/${P}.tar.gz"
@@ -15,5 +15,5 @@ RDEPEND="games-misc/fortune-mod"
src_install() {
insinto /usr/share/fortune
- doins calvin calvin.dat || die
+ doins calvin calvin.dat
}
diff --git a/games-misc/fortune-mod-chucknorris/Manifest b/games-misc/fortune-mod-chucknorris/Manifest
index 3efc38d0606a..9f8b5fa99885 100644
--- a/games-misc/fortune-mod-chucknorris/Manifest
+++ b/games-misc/fortune-mod-chucknorris/Manifest
@@ -1 +1 @@
-DIST chucknorris.tar.gz 23035 RMD160 2df92b65c5f95a8191d536445088986850b23fbd SHA1 a191594303b1b488dcf1194ce354097a9222c221 SHA256 c6407f9869e75fce90d0211045f7e485126332ab4790ecb9de4d0722218466ca
+DIST chucknorris.tar.gz 23035 SHA256 c6407f9869e75fce90d0211045f7e485126332ab4790ecb9de4d0722218466ca SHA512 efcee2c1ce5ee747cbdf3cfb0b52958ca76309cbf509627b602cbc56403e67396c879ea46c084b3d82788404829e48990a534eda9e8f3640d39dc894318ca7c2 WHIRLPOOL 84f392df46441416a823b861cfdc08e8eef005e7b8c6460c05822d4aab778cc6177e92828983f006228b8db2444a1c05cc60d616e1dd656055c8e162b6821c87
diff --git a/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild b/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild
index 9831eb86f011..92f55239e148 100644
--- a/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild
+++ b/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild,v 1.9 2010/12/12 18:20:17 grobian Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild,v 1.10 2015/02/04 17:41:21 tupone Exp $
+EAPI=5
DESCRIPTION="Chuck Norris Facts"
HOMEPAGE="http://www.k-lug.org/~kessler/projects.html"
SRC_URI="http://www.k-lug.org/~kessler/chucknorris.tar.gz"
@@ -17,5 +17,5 @@ S=${WORKDIR}/${PN/mod-/}
src_install() {
insinto /usr/share/fortune
- doins chucknorris chucknorris.dat || die
+ doins chucknorris chucknorris.dat
}
diff --git a/games-misc/fortune-mod-cs/Manifest b/games-misc/fortune-mod-cs/Manifest
index 5e572b2bcd0f..14edfee24a6a 100644
--- a/games-misc/fortune-mod-cs/Manifest
+++ b/games-misc/fortune-mod-cs/Manifest
@@ -1 +1 @@
-DIST fortune-cs-1.6.9.tar.bz2 390766 RMD160 4867864efd50f81e506ed9ec0b14e267fa1854b6 SHA1 78a4c21c4773bda7a956f94d6a6d8d80f7aa8fcd SHA256 5a73b66071635b1213e61c18f68eeca70e16aa5c18bdcfdf33f580722e46ea7d
+DIST fortune-cs-1.6.9.tar.bz2 390766 SHA256 5a73b66071635b1213e61c18f68eeca70e16aa5c18bdcfdf33f580722e46ea7d SHA512 4df546eb450edc1de6bb80f788e29fa4aad6050008c28ed12c4afd630533416f3367c09b43ae098329160a19bebfb28ec56ebb730358689d260709a27317b20c WHIRLPOOL b69dbbf4c1516584bc75a4a378f434ed2da37a4bd0a34749029297b35882a2240a6a8521dce3148d7feeda98a8620854709febce3deef7772aa59d3ed73b420a
diff --git a/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild b/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild
index e6d7ff79b0f0..a858cd7a3777 100644
--- a/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild
+++ b/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild,v 1.10 2010/12/12 18:17:20 grobian Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild,v 1.11 2015/02/04 17:43:32 tupone Exp $
+EAPI=5
DESCRIPTION="Database of the Czech and Slovak cookies for the fortune(6) program"
HOMEPAGE="http://ftp.fi.muni.cz/pub/linux/people/zdenek_pytela/"
SRC_URI="http://ftp.fi.muni.cz/pub/linux/people/zdenek_pytela/${P/-mod/}.tar.bz2"
@@ -17,9 +17,7 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${P/-mod/}
-src_unpack() {
- unpack ${A}
- cd "${S}"
+src_prepare() {
rm -f LICENSE install.sh fortune-cs.* *xpm
}
@@ -36,6 +34,6 @@ src_compile() {
src_install() {
insinto /usr/share/fortune/cs
- doins [[:lower:]]* || die "doins failed"
+ doins [[:lower:]]*
dodoc [[:upper:]]*
}
diff --git a/media-gfx/darktable/darktable-1.6.2.ebuild b/media-gfx/darktable/darktable-1.6.2.ebuild
index b418865b43aa..84d6fccdab54 100644
--- a/media-gfx/darktable/darktable-1.6.2.ebuild
+++ b/media-gfx/darktable/darktable-1.6.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-1.6.2.ebuild,v 1.1 2015/02/01 16:40:45 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-1.6.2.ebuild,v 1.2 2015/02/04 16:04:45 radhermit Exp $
EAPI=5
@@ -20,6 +20,9 @@ IUSE="colord cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kde
nls opencl openmp openexr pax_kernel +rawspeed +slideshow +squish web-services webp
${LANGS// / linguas_}"
+# sse3 support is required to build darktable
+REQUIRED_USE="cpu_flags_x86_sse3"
+
CDEPEND="
dev-db/sqlite:3
>=dev-libs/glib-2.28:2
@@ -66,10 +69,6 @@ pkg_pretend() {
if use openmp ; then
tc-has-openmp || die "Please switch to an openmp compatible compiler"
fi
-
- if ! use cpu_flags_x86_sse3 ; then
- eerror "This package requires a CPU supporting the SSE3 instruction set." && die
- fi
}
src_prepare() {
diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
index f7bd9d2d3fbd..e8a6cef4dc5c 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-9999.ebuild,v 1.16 2015/02/01 16:43:34 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-9999.ebuild,v 1.17 2015/02/04 16:04:45 radhermit Exp $
EAPI=5
@@ -19,6 +19,9 @@ IUSE="colord cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kde
nls opencl openmp openexr pax_kernel +rawspeed +slideshow +squish web-services webp
${LANGS// / linguas_}"
+# sse3 support is required to build darktable
+REQUIRED_USE="cpu_flags_x86_sse3"
+
CDEPEND="
dev-db/sqlite:3
>=dev-libs/glib-2.28:2
@@ -65,10 +68,6 @@ pkg_pretend() {
if use openmp ; then
tc-has-openmp || die "Please switch to an openmp compatible compiler"
fi
-
- if ! use cpu_flags_x86_sse3 ; then
- eerror "This package requires a CPU supporting the SSE3 instruction set." && die
- fi
}
src_prepare() {
diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index df065596445b..5eef5f7bb134 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -1,10 +1,6 @@
-
- radhermit@gentoo.org
- Tim Harder
-
graphics