Install missing ppd files, bug #356695 comment #5 by Mads <mads@ab3.no>. Bump to EAPI 4.

Package-Manager: portage-2.1.9.42/cvs/Linux i686

3 files changed, 31 insertions, 14 deletions

diff --git a/net-print/foo2zjs/ChangeLog b/net-print/foo2zjs/ChangeLog
index 5c4d23441723..71b13c7b8f1f 100644
--- a/net-print/foo2zjs/ChangeLog
+++ b/net-print/foo2zjs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/foo2zjs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/ChangeLog,v 1.41 2011/06/02 10:36:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/ChangeLog,v 1.42 2011/06/02 15:15:55 phajdan.jr Exp $
+
+  02 Jun 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> foo2zjs-99999999.ebuild:
+  Install missing ppd files, bug #356695 comment #5 by Mads <mads@ab3.no>. Bump
+  to EAPI 4.
 
   02 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   foo2zjs-20080225.ebuild, foo2zjs-20081129.ebuild, foo2zjs-99999999.ebuild:
diff --git a/net-print/foo2zjs/Manifest b/net-print/foo2zjs/Manifest
index e9db5f6c664b..736569a280b9 100644
--- a/net-print/foo2zjs/Manifest
+++ b/net-print/foo2zjs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX foo2zjs-20081129-Makefile.patch 4709 RMD160 670d88781bd13e6a63be3983c46ef25dd28db6b5 SHA1 197601abfed199f38b1c3588b0d37f2e0f9daf5e SHA256 d093d2cc2501fa7d84397e12b0085c18747134934540236f072919767edc3b56
 AUX foo2zjs-20081129-udevfwld.patch 7851 RMD160 c4ffc179e248ac759e7d94d4bebabe518c5b02af SHA1 40684cd6daf35d7cfb4fb8780994964dc01ad246 SHA256 f10883053501866e0925ad7953801caaa8bedc10644449aa39c0331f30a10d5c
 AUX foo2zjs-Makefile-20080225.diff 5724 RMD160 4348836658ad0f339b77ba2aff5ac003a28020a6 SHA1 173fbfd9446a9698d651077528216f16a9a30054 SHA256 052e9a385ebd460d9ca5614f02d3167a2314b71759ade19e52b295849c81b129
@@ -24,6 +27,13 @@ DIST sihpP1006.tar.gz 153532 RMD160 aa7167b49b24d6fe2f09c6805a2caf45193321a2 SHA
 DIST sihpP1505.tar.gz 166072 RMD160 3968a33dd8263f73ebad07173bb62d8d186f5511 SHA1 ed2bbeaacb41bb8599bbdb0acd0758596e3ce090 SHA256 f631bce116447af89b1740c3b9732666348579a9dcd96d6f31121d5586332f35
 EBUILD foo2zjs-20080225.ebuild 4105 RMD160 93819faf425cf4fe58a73f0797bb8be7dc299108 SHA1 c9761da96951ee19b100e3406908827d17f73fab SHA256 08097a4b38c5050bc92d618c476718681dfc3b66e07a29dfa2bc440f2c44d1c7
 EBUILD foo2zjs-20081129.ebuild 4499 RMD160 f1c1f469b080eb61c1cb8fde45b2061c871de3ec SHA1 1097b8bac0d77fc3a9088e577bae3c0c2cc6a652 SHA256 298b474e2a8b0031c69ff4c7396e446f3e984dfc47ab0aa9e97a4cb577c08e59
-EBUILD foo2zjs-99999999.ebuild 1213 RMD160 1f29822faa83d8f97d52799371ed2a95a15a451c SHA1 3a54454c018b5d8cae681ee202cfd1fbd0a60ebe SHA256 1cdc41214b5f005a0b85c025d59984f35348e7dfa68f67a6b95f8c5e68170544
-MISC ChangeLog 9292 RMD160 fa0c602bd2118b9c9512e8e3eb64ecc2aaaf55a3 SHA1 82129aa7e6b6204e6cb8b948d3f0dd5ea1d7f4ed SHA256 8f654d0362ad05af0bc86f0b68150c4ceb7bba38e3234cefd3aad3838b7a8457
+EBUILD foo2zjs-99999999.ebuild 1249 RMD160 0c806eb88eed1e338b0b726dc89642cd310b45a0 SHA1 b326da4c8a2169a05f9faf6b1292f0124851a6eb SHA256 740bc28eb0cd5f0c7dea4cf4f8691e0039aa234a34fb535d56df5bd2ee2b7379
+MISC ChangeLog 9467 RMD160 207979fa86cf55c66cea841a6743ae500f56276d SHA1 432190cca0ba3656272809b88f84e61621a907b2 SHA256 6c9e5fb94ac14001a1670db13a3af5b4a923ad05cd62361102733f1f06b15980
 MISC metadata.xml 163 RMD160 ba353b61c2868f08c1a5ab7fd17ba07e23803ada SHA1 2c739f5b77738ff409261fc42afe98d34184dd59 SHA256 594509291d2b412ff651880da503140d0e9a954ecf778878edabb1875682b6b8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk3nqTcACgkQuUQtlDBCeQLGYgCghoNA9DiLDsbpl5WtUgoadv9A
+Z94AnRGm4byWB8DWVNwiFlyZ8Pwa6ADf
+=n4cs
+-----END PGP SIGNATURE-----
diff --git a/net-print/foo2zjs/foo2zjs-99999999.ebuild b/net-print/foo2zjs/foo2zjs-99999999.ebuild
index 82047023d359..ac7522f31035 100644
--- a/net-print/foo2zjs/foo2zjs-99999999.ebuild
+++ b/net-print/foo2zjs/foo2zjs-99999999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/foo2zjs-99999999.ebuild,v 1.2 2011/06/02 10:36:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/foo2zjs-99999999.ebuild,v 1.3 2011/06/02 15:15:55 phajdan.jr Exp $
 
-EAPI="3"
+EAPI="4"
 
 inherit eutils
 
@@ -21,7 +21,6 @@ RDEPEND="net-print/cups
 	net-print/foomatic-filters
 	sys-fs/udev"
 DEPEND="${RDEPEND}
-	app-text/ghostscript-gpl
 	app-arch/unzip
 	net-misc/wget
 	sys-devel/bc"
@@ -30,26 +29,30 @@ S="${WORKDIR}/${PN}"
 
 src_unpack() {
 	einfo "Fetching ${PN} tarball"
-	wget "http://foo2zjs.rkkda.com/${PN}.tar.gz" || die
-	tar zxf "${WORKDIR}/${PN}.tar.gz" || die
+	wget "http://foo2zjs.rkkda.com/${PN}.tar.gz"
+	tar zxf "${WORKDIR}/${PN}.tar.gz"
 
-	cd "${S}" || die
+	cd "${S}"
 
 	einfo "Fetching additional files (firmware, etc)"
-	emake getweb || die
+	emake getweb
 
 	# Display wget output, downloading takes some time.
-	sed -e '/^WGETOPTS/s/-q//g' -i getweb || die
+	sed -e '/^WGETOPTS/s/-q//g' -i getweb
 
-	./getweb all || die
+	./getweb all
 }
 
 src_prepare() {
 	# Prevent an access violation, do not create symlinks on live file system
 	# during installation.
-	sed -e 's/ install-filter / /g' -i Makefile || die
+	sed -e 's/ install-filter / /g' -i Makefile
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	# ppd files are installed automagically. We have to create a directory
+	# for them.
+	mkdir -p "${D}/usr/share/ppd"
+
+	emake DESTDIR="${D}" install
 }