diff options
author | Sebastien Fabbro <bicatali@gentoo.org> | 2013-06-13 20:05:30 +0000 |
---|---|---|
committer | Sebastien Fabbro <bicatali@gentoo.org> | 2013-06-13 20:05:30 +0000 |
commit | 9c5075cf79f9cf3bd9382d6659399824ae982d33 (patch) | |
tree | 4b91e5e92074a4710d8cd62d187e17232a37c076 /media-libs/netpbm | |
parent | Stable for amd64 wrt bug #469382 (diff) | |
download | gentoo-2-9c5075cf79f9cf3bd9382d6659399824ae982d33.tar.gz gentoo-2-9c5075cf79f9cf3bd9382d6659399824ae982d33.tar.bz2 gentoo-2-9c5075cf79f9cf3bd9382d6659399824ae982d33.zip |
Keyword amd64-linux and x86-linux
(Portage version: 2.2.01.22013-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
Diffstat (limited to 'media-libs/netpbm')
-rw-r--r-- | media-libs/netpbm/ChangeLog | 5 | ||||
-rw-r--r-- | media-libs/netpbm/netpbm-10.61.00.ebuild | 20 |
2 files changed, 14 insertions, 11 deletions
diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog index 291c9514ff7a..fbe4e0aee7b6 100644 --- a/media-libs/netpbm/ChangeLog +++ b/media-libs/netpbm/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/netpbm # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.270 2013/05/29 15:15:05 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.271 2013/06/13 20:05:30 bicatali Exp $ + + 13 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org> netpbm-10.61.00.ebuild: + Keyword amd64-linux and x86-linux 29 May 2013; Mike Frysinger <vapier@gentoo.org> +files/netpbm-10.61-test.patch, netpbm-10.61.00.ebuild: diff --git a/media-libs/netpbm/netpbm-10.61.00.ebuild b/media-libs/netpbm/netpbm-10.61.00.ebuild index df79a66fec6c..73f3a35b6cf9 100644 --- a/media-libs/netpbm/netpbm-10.61.00.ebuild +++ b/media-libs/netpbm/netpbm-10.61.00.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.61.00.ebuild,v 1.4 2013/05/29 15:15:05 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.61.00.ebuild,v 1.5 2013/06/13 20:05:30 bicatali Exp $ EAPI="4" @@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~amd64-linux ~x86 ~x86-fbsd ~x86-linux" IUSE="doc jbig jpeg jpeg2k png rle svga tiff X xml zlib" RDEPEND="jbig? ( media-libs/jbigkit ) @@ -159,18 +159,18 @@ src_test() { src_install() { # Subdir make targets like to use `mkdir` all over the place # without any actual dependencies, thus the -j1. - emake -j1 package pkgdir="${D}"/usr + emake -j1 package pkgdir="${ED}"/usr - [[ $(get_libdir) != "lib" ]] && mv "${D}"/usr/lib "${D}"/usr/$(get_libdir) + [[ $(get_libdir) != "lib" ]] && mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) # Remove cruft that we don't need, and move around stuff we want - rm "${D}"/usr/bin/{doc.url,manweb} || die - rm -r "${D}"/usr/man/web || die - rm -r "${D}"/usr/link || die - rm "${D}"/usr/{README,VERSION,config_template,pkginfo} || die + rm "${ED}"/usr/bin/{doc.url,manweb} || die + rm -r "${ED}"/usr/man/web || die + rm -r "${ED}"/usr/link || die + rm "${ED}"/usr/{README,VERSION,config_template,pkginfo} || die dodir /usr/share - mv "${D}"/usr/man "${D}"/usr/share/ || die - mv "${D}"/usr/misc "${D}"/usr/share/netpbm || die + mv "${ED}"/usr/man "${ED}"/usr/share/ || die + mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die doman userguide/*.[0-9] use doc && dohtml -r userguide |