summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-02-10 21:49:45 +0000
committerMike Frysinger <vapier@gentoo.org>2008-02-10 21:49:45 +0000
commit34b9413e7098d309ce30352e5122aade25416e59 (patch)
tree3768af292d70678adcc929bf4ebbef80ca8424a4 /media-libs/netpbm
parentmips stable (diff)
downloadgentoo-2-34b9413e7098d309ce30352e5122aade25416e59.tar.gz
gentoo-2-34b9413e7098d309ce30352e5122aade25416e59.tar.bz2
gentoo-2-34b9413e7098d309ce30352e5122aade25416e59.zip
Touchup src_install to match newer file layout #209526 by Diego.
(Portage version: 2.1.4.1)
Diffstat (limited to 'media-libs/netpbm')
-rw-r--r--media-libs/netpbm/ChangeLog5
-rw-r--r--media-libs/netpbm/netpbm-10.41.0.ebuild17
2 files changed, 12 insertions, 10 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/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