Touchup src_install to match newer file layout #209526 by Diego.

Package-Manager: portage-2.1.4.1

3 files changed, 18 insertions, 16 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index bb2794830440..3da2b222c69e 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.180 2008/02/09 23:16:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.181 2008/02/10 21:49:45 vapier Exp $
+
+  10 Feb 2008; Mike Frysinger <vapier@gentoo.org> netpbm-10.41.0.ebuild:
+  Touchup src_install to match newer file layout #209526 by Diego.
 
 *netpbm-10.41.0 (09 Feb 2008)
 
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 69c8e71eaca1..68bcd6cd4319 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -13,14 +13,14 @@ DIST netpbm-10.40.0.tar.bz2 2126805 RMD160 17057c1bb90c90080a83726a60cc69fa00840
 DIST netpbm-10.41.0.tar.lzma 1859778 RMD160 13ce996b6edbcd8602fc830a1796138cfc46cdb5 SHA1 51b1abb41059b342c4a6db2224728aaf5aa20c19 SHA256 88974be8cb7fe2df15e742663855239ab8d9a7476c864b6b6a2d5a8fcf08a92d
 EBUILD netpbm-10.26.49.ebuild 2888 RMD160 ece9dbeadc7ac34c8c21b865d2faae7c84b7ff96 SHA1 08aa56d44f2b15168c4158c589a63e4c832ed678 SHA256 229ff0299c0d45350b69b08d7e841dd1e77aced7f2ca09fec0bd3cd20160e338
 EBUILD netpbm-10.37.0.ebuild 3176 RMD160 c845bcb06d679218d0c5f1ad803c9cd879ad3410 SHA1 e5582dce796933d3a4049a07befaf3aeac9628a0 SHA256 5f273a533588bd933701d2e3efabc034701a9c1e01085a7d810646f2f07676b6
-EBUILD netpbm-10.40.0.ebuild 3176 RMD160 f55a7bb26a9e77fca095583dda37c289a27aa865 SHA1 781af81b8116958b6a3cdec4a14c9ec5b9c43e87 SHA256 1d2aa91e2ce566a2129541b4a545164ea70b40784b9054062ba2bd8fb8c49bf7
-EBUILD netpbm-10.41.0.ebuild 3895 RMD160 5af5761cbcd2a2a768815de806fa802308376097 SHA1 43535f2c62f7c5a0d73b7f0fbd6dc2a197dd5a08 SHA256 793fe4469f307815882a9bac9822fbd35b0ecace147cc95cdb179d2c68692908
-MISC ChangeLog 24389 RMD160 aa11e39f3b27c9b2f96b9c63a368064051efbd2c SHA1 9e71e967bc579f76e03e62c3569b8e3ce9a3789c SHA256 e807580dbb7d753f58b7df06d362f8c9e797791b7cf4dec76ecd65ca3822c342
+EBUILD netpbm-10.40.0.ebuild 3175 RMD160 77e350a029ed0b406e59614c6aa60bdc0f15e231 SHA1 7b5bc1fc11319ef6309c6d53bad11e8446bb3886 SHA256 ca385bb5fcb3a0d0afc6138e4c47cf8187ba33f309030211a191964c06511def
+EBUILD netpbm-10.41.0.ebuild 3908 RMD160 b35b09989bf6608ff4139e8f22b2a3ec215f08f9 SHA1 5d5e43380dfd3f47525ef0850bf3325f08c2877f SHA256 e75ece2e2dee7c0f020f6d9c16aad98981516f0dc9ebeeeda718c30776c9d386
+MISC ChangeLog 24530 RMD160 e8f43bbb75dee51f7c5cdd927e5a8dd2bd1f2c0f SHA1 f078ed2862aa47ef7d6f2d62d7646560f6491974 SHA256 f5aaea87b815ee32a4132d0629cace3ef4ecd57a537fe8e6c40fe3a7e531e882
 MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHrjRdj9hvisErhMIRAoWDAKDe30sSUUrL4J2h/+/8BuCjDiWAhwCghOWQ
-UkVGnN3qQtXJXzaWAMyN1zc=
-=e6gq
+iD8DBQFHr3GAj9hvisErhMIRAjL5AJ0c/eEE4ZZ8oKZXkhv1DhSwe8EKBACeNOIf
+S4zXYZknZR2b1yXNZWNxvUQ=
+=YZ52
 -----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/netpbm-10.41.0.ebuild b/media-libs/netpbm/netpbm-10.41.0.ebuild
index ace1fb4343b8..0195bedff080 100644
--- a/media-libs/netpbm/netpbm-10.41.0.ebuild
+++ b/media-libs/netpbm/netpbm-10.41.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.41.0.ebuild,v 1.1 2008/02/09 23:16:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.41.0.ebuild,v 1.2 2008/02/10 21:49:45 vapier Exp $
 
 inherit flag-o-matic toolchain-funcs eutils multilib
 
@@ -126,19 +126,18 @@ src_compile() {
 }
 
 src_install() {
-	make package pkgdir="${D}"/usr || die "make package failed"
+	emake -j1 package pkgdir="${D}"/usr || die "make package failed"
 
 	[[ $(get_libdir) != "lib" ]] && mv "${D}"/usr/lib "${D}"/usr/$(get_libdir)
 
 	# Remove cruft that we don't need, and move around stuff we want
-	rm "${D}"/usr/include/shhopt.h
-	rm -f "${D}"/usr/bin/{doc.url,manweb}
-	rm -rf "${D}"/usr/man/web
-	rm -rf "${D}"/usr/link
-	rm -f "${D}"/usr/{README,VERSION,config_template,pkginfo}
+	rm -f "${D}"/usr/bin/{doc.url,manweb} || die
+	rm -r "${D}"/usr/man/web || die
+	rm -r "${D}"/usr/link || die
+	rm -f "${D}"/usr/{README,VERSION,config_template,pkginfo} || die
 	dodir /usr/share
-	mv "${D}"/usr/man "${D}"/usr/share/
-	mv "${D}"/usr/misc "${D}"/usr/share/netpbm
+	mv "${D}"/usr/man "${D}"/usr/share/ || die
+	mv "${D}"/usr/misc "${D}"/usr/share/netpbm || die
 
 	dodoc README
 	cd doc