EAPI bump; fix foomatic dependency

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

4 files changed, 39 insertions, 32 deletions

diff --git a/net-print/foomatic-filters-ppds/ChangeLog b/net-print/foomatic-filters-ppds/ChangeLog
index 5dced03ce1e7..a426820455c7 100644
--- a/net-print/foomatic-filters-ppds/ChangeLog
+++ b/net-print/foomatic-filters-ppds/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/foomatic-filters-ppds
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters-ppds/ChangeLog,v 1.28 2013/12/27 22:39:12 dilfridge Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters-ppds/ChangeLog,v 1.29 2014/01/05 22:05:27 dilfridge Exp $
+
+  05 Jan 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  foomatic-filters-ppds-20070501.ebuild, foomatic-filters-ppds-20080507.ebuild:
+  EAPI bump; fix foomatic dependency
 
   27 Dec 2013; Andreas K. Huettel <dilfridge@gentoo.org>
   foomatic-filters-ppds-20070501.ebuild, foomatic-filters-ppds-20080507.ebuild:
diff --git a/net-print/foomatic-filters-ppds/Manifest b/net-print/foomatic-filters-ppds/Manifest
index 010461266d05..d094f8fe1d3f 100644
--- a/net-print/foomatic-filters-ppds/Manifest
+++ b/net-print/foomatic-filters-ppds/Manifest
@@ -3,25 +3,27 @@ Hash: SHA256
 
 AUX foomatic-filters-ppds-20070501-remove-bashisms.patch 1833 SHA256 3ce1d7a43218dc1326947ba6ef61ac901cf5c918ea40bc089ef99c64b34fbe01 SHA512 d1cb33dbcafd7b94c077d19fcb39842a56833c4674b301a94d4401423541a1aec5a310811c024a182019fd09f2dc820c70a60ef1e1f27f225a157da488c199e7 WHIRLPOOL b6eb655df66d51205bf75a5c4377644c3d54f2b27b63c946e9dbca9ee6caf0e15d17fe0ba043bf9a95b5549bcb49723ac2124c955b8c8f00d62f9bdefdd1ff7a
 DIST foomatic-filters-ppds-20070501.tar.gz 12434678 SHA256 6c1b87c93b887b6ed1a95f5d99249abeaef286b927da37a6efe87bdd51187622 SHA512 fad6fca9d8232beb7fcb8a7f644d232fca62304f79d6b4ba91064ff9fcc1bf420832acc804107729d8060f3dfd2bbce45370d0b1ac06e727053bc44c0a9c0444 WHIRLPOOL 8c9b921edbf3ec1c1bcd3f278acfafa6acd3a634f745f5679f6da4a04a441eeff8cd96c77d5c2b1c739eb3b5cb974ef3d78cf5f42ee59292f1867336003cc23b
-DIST foomatic-filters-ppds-20080507.tar.gz 14125266 SHA256 26b928db425c23a9618b3b3e2267f8b16d1962cb056eb25db8ed8f751227dfc2
-EBUILD foomatic-filters-ppds-20070501.ebuild 1303 SHA256 8f269e018c2208a2e4dfd67121dae08a6836c3f7ea11896c14ec999bae12bcb0 SHA512 97a0cc8a84424532c517dcf5cf8bf89b2172fc33cd49cf61dab0468804bba8ad92fd2f2cacc41d1272ac29d7adb2339d5daf9a992c3c7f744de34dba73759c08 WHIRLPOOL d84836608a9e769d0a35788067068f8309f69d6a9541e717fb1572ecd347020f0477fdfdb697796a8a03ba8102566ff31fea15be87ab64fdb7db69cbd64f9293
-EBUILD foomatic-filters-ppds-20080507.ebuild 1329 SHA256 6ee5493e075493785a08c336d50dbc0229efbf9c0aff0d349858a7c66e62dd17 SHA512 b355e915e0b90c4c70dd9ee5b8b17d528c501c29ae3bbf0aa259f769c4b31a16f4f6c2f76a8e2fb3584ab19ca76cca533da8605742c2c814f1763eb199765887 WHIRLPOOL d91956d8b6e085240966e2cc3d46a77b0af180635d0b3b7019eb3880cf40f0ccbdb6d2deb33d35df058ad4b7e0f751e361915b655e528ad96402995d17b1262c
-MISC ChangeLog 4054 SHA256 088773e1f3cab30c159f070a3a73d17e9a95183584177207607b9e4627334b4f SHA512 4c3e0fb63fa5645c401cbbd07059a094221360184da33cd17dd301e0beb6f0e659f97ee1ec71b84dd0b61901784fdc2c417e190b379f9cdffc0e3889f8bb96d5 WHIRLPOOL 9cb8dd3f4c024838000e3cd5397ec26b667fbae9ff8353e40bb6e1b4515c2350bb07a3f76e580848429675fd4c5faea49888b61f39fd612830b5b6d25f84ff7e
+DIST foomatic-filters-ppds-20080507.tar.gz 14125266 SHA256 26b928db425c23a9618b3b3e2267f8b16d1962cb056eb25db8ed8f751227dfc2 SHA512 2a6c08efba45ac5bbb0896e0e0ca0affefc56368b9d7047cf8112b371da211662020d0c0628ffcb5eeb2c9fec917d627fa55df317fe3d4ce4ec9c881236a2cab WHIRLPOOL 4cb03cc5b77c27b546d363157d5ba1ff57bbda9c12d3d140cc6e5dfcfd50f4df7d6994297337bc2a5fc0cc6351e730014c52e94218b4b3e774f756b57e5c7f95
+EBUILD foomatic-filters-ppds-20070501.ebuild 1319 SHA256 1309f09f3c0bfa44b71284e4fae7ec7145985dbd27c1019030d0c01e309bc382 SHA512 41584e31c6ce2699483ca8f2da71dbfb0cd3413c4cb51ebefcf18b4e0b12dd38e62c284d3a540466240400459bc7ec64cf5e526e94d436c63f02a5e7ed367cc1 WHIRLPOOL d3857b329cbda3749109a5285a862d071f98c1140cce60557baa447cd508d637a2261bad1c07c524347639005c24ba7af3171c881f689767f869875ddc775971
+EBUILD foomatic-filters-ppds-20080507.ebuild 1334 SHA256 68a4ed0b43f7457de37fbc979f92f09708778112405be945e9660b69c1ecdd1a SHA512 f3a29c3f7c27befc39ef47b55d4dde330a8ee5e9f0e869cf62a330981ded8a62c18d0070859e3f42202081118f4a2aa7fb0f0b9206f45747f8d30fc0ae200c6e WHIRLPOOL e32d5ed4e608ddc47548d35149380e1d712ff3779bf903a06303b89f54e3b4456015feb36a312c59b9a18c762d28b2c50d80249b525b510fa743135a2c67c6f9
+MISC ChangeLog 4229 SHA256 da6dbad6f04ae50f789ffe255246a998e19d42d7c081a5042fec918fe5770caa SHA512 78cdc44dc48725af93df4fd099da458e1c2ca3a28f39e7cdb05198f726fc0b431f9691ea1b6946111fee6cd0c002719d4a57d72158a7214835a9fddcf4a4b416 WHIRLPOOL fd7d29f7d7bc16451d28c2614282f67c1c5cc75c8046832b44a065b20909e26c7c91f4192655ab8276a2d68318797e600ddb62b2184142ad7b5420fddea47a79
 MISC metadata.xml 161 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 SHA512 3b5d653ba492267297653f61d148b859d366b53d9c29670f175c84622f6ad64141e93e30db08e24f87a75e6fcf1ab187cc8783b72aa2ee1709cf1ef6c7c75e22 WHIRLPOOL 2516e48e62e1604c152e32a6336881cb02f3599c23856a220019bc807611880480bfe4af7a60a2bb45efbb93faf89141ccfd9fde69044677604bf976dfb65988
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSvgIjAAoJEJS/30SErRQvrTgP/2ayFngl4logtGNbqNtTDoq2
-RHqZWYEyIBgsX8TYp9P4Qa12eJCMDkWz1aaM4EkAZ5i39WQW4LKiDb8j5IX4x3aD
-U97aLBdDwQkirTOtTyg2nGdoXyDTinn+h2wTrSUmMOW0YZBBCrUb+erB01aOBnMA
-f1ACAfVqQetYPn1umdhF8vFP5sRL9X9A3PlF4PIhPOZ8S8VGeeECLKGXgG/SJdZ0
-GvEFq7cR9yqpxfEyEV/FULajeNK6bT+Sia+jkP669cOzJ9ez8HMWxdts3/yrFre/
-gjgpiCKe4gYlJ6oJeBOgmUSTcnIKS6mHKUAaUE4QHp0QEyjlpgftHkVxJneewDaX
-uvbazU9DLSj/yw0jJyNFRS3f9ytH+uVVRpU3bDHxxOtcm2K+m5bE7otmIZPct9sV
-s8Il0okBds/EGVlkuejg+M7mkpjzThE2PiGxW2SDcDUX6JVxXC3rB3xQs/+FZoYb
-Hlt8A9NhPc72QrsGdgx7KzmYWPRKA99ReLJAM3JGo6dmfD44gmvdV6spm45y2xfE
-PpTwQ0sFAtKDWV4HwQbnDFzDGd/RrvukZzD4jsmcIC8xpYJaN1Dcjh7P//kmbKL8
-Dm2cR5eTPGm/3/PN+scO5/kRBbFmHW7ufh1LWPfHKo/UZkfNazCmZZpHu+RuBud8
-hvokGcV/mSbeUM0pzzXI
-=n2Mk
+iQJ8BAEBCABmBQJSyddzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOce60QALRy/qzfGvwZX3BSs6zvQ1k/
+eAHeqfqrWQNhNQ2XfoM9gLjdkKNhGNXQIVMuiLgCMo73VaIMU9EhL7niRNfIa91+
+bm6cz8cWj+IBqWFxHBFzn6qNfY4i0htsIW9if93TBlYvILsmsFsAUUeKMXuIrQfo
+H5BLBWjcYRW2gXcFvOeElfspUz9bh89qaz074gk+kridD8FfObtqQw6mHs4eng/6
+uwOJNiwxppo1wkwvj/nCar/yFSle9ZHORWGkvo+EiBX4P2L/RRBNWeRyOJrDX/Jx
+uMqtR6MF0O5ov3tAgeDnbHUYAhg6ryOLY4J4tSsjRIjEpcOyEQjUXUinalY75XaF
+llfGVIDp8LnTrOrKsSNvnWyOMMQeUxBbWlXthVvKjmxKaZRGA6HcONcAtoP3YpXr
++CZxtwBepTfqACrxoarQ0BFq6BqRY9jzoQ2umUGBXL8I+c3EEaXT64eZw75KbMCm
+WaD/VKQdOl6PsiSaun5dIpcpAxS4cNMKfnyev+LTvMwZMVQjsy02PcWxlRYt62YQ
+nYx+5S5Vae7Bt1h20tifL8dmK6Z4yBKjAaEvIxrm/ikj5wA/QcLzPLhReIJgCyyg
+Mj/wJCg2Vw7T/jmRvt3bipnK/nyoWcnPsUFvuyzUI68ykfou4fgQubhQSkIe9P9M
+4HoSnawveIEdQwrzXEm2
+=ftdT
 -----END PGP SIGNATURE-----
diff --git a/net-print/foomatic-filters-ppds/foomatic-filters-ppds-20070501.ebuild b/net-print/foomatic-filters-ppds/foomatic-filters-ppds-20070501.ebuild
index b2bb5bae4091..4469350c7894 100644
--- a/net-print/foomatic-filters-ppds/foomatic-filters-ppds-20070501.ebuild
+++ b/net-print/foomatic-filters-ppds/foomatic-filters-ppds-20070501.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters-ppds/foomatic-filters-ppds-20070501.ebuild,v 1.18 2013/12/27 22:39:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters-ppds/foomatic-filters-ppds-20070501.ebuild,v 1.19 2014/01/05 22:05:27 dilfridge Exp $
+
+EAPI=5
 
 inherit eutils
 
@@ -15,13 +17,12 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="
-	|| ( >=net-print/cups-filters-1.0.43 net-print/foomatic-filters )
+	|| ( >=net-print/cups-filters-1.0.43-r1[foomatic] net-print/foomatic-filters )
 "
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
 	# Fix a symlink collision, see bug #172341
-	sed -i -e '/ln -s \$prefix\/share\/ppd \$destdir\$ppddir\/foomatic-ppds/d' "${S}"/install
+	sed -i -e '/ln -s \$prefix\/share\/ppd \$destdir\$ppddir\/foomatic-ppds/d' "${S}"/install || die
 	# Fix building if /bin/sh isn't bash.  Bug #176799
 	epatch "${FILESDIR}"/${P}-remove-bashisms.patch
 }
diff --git a/net-print/foomatic-filters-ppds/foomatic-filters-ppds-20080507.ebuild b/net-print/foomatic-filters-ppds/foomatic-filters-ppds-20080507.ebuild
index b8231448fa7a..5eea08ecdea6 100644
--- a/net-print/foomatic-filters-ppds/foomatic-filters-ppds-20080507.ebuild
+++ b/net-print/foomatic-filters-ppds/foomatic-filters-ppds-20080507.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters-ppds/foomatic-filters-ppds-20080507.ebuild,v 1.2 2013/12/27 22:39:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters-ppds/foomatic-filters-ppds-20080507.ebuild,v 1.3 2014/01/05 22:05:27 dilfridge Exp $
+
+EAPI=5
 
 inherit eutils
 
@@ -15,14 +17,12 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 IUSE=""
 
 RDEPEND="
-	|| ( >=net-print/cups-filters-1.0.43 net-print/foomatic-filters )
+	|| ( >=net-print/cups-filters-1.0.43-r1[foomatic] net-print/foomatic-filters )
 "
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	# Fix a symlink collision, see bug #172341
-	sed -i -e '/ln -s \$prefix\/share\/ppd \$destdir\$ppddir\/foomatic-ppds/d' "${S}"/install
+	sed -i -e '/ln -s \$prefix\/share\/ppd \$destdir\$ppddir\/foomatic-ppds/d' "${S}"/install || die
 	# Fix building if /bin/sh isn't bash.  Bug #176799
 	epatch "${FILESDIR}/${PN}-20070501-remove-bashisms.patch"
 }