Now install perl modules in vendor instead of site-dir, bug #310839

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 20 insertions, 260 deletions

diff --git a/media-gfx/graphicsmagick/ChangeLog b/media-gfx/graphicsmagick/ChangeLog
index f96466d39cb3..9227fcdaa785 100644
--- a/media-gfx/graphicsmagick/ChangeLog
+++ b/media-gfx/graphicsmagick/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/graphicsmagick
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.63 2010/03/21 10:34:32 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.64 2010/03/24 05:52:29 bicatali Exp $
+
+  24 Mar 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  -graphicsmagick-1.3.10.ebuild, -graphicsmagick-1.3.11.ebuild,
+  graphicsmagick-1.3.12.ebuild:
+  Now install perl modules in vendor instead of site-dir, bug #310839
 
   21 Mar 2010; Fabian Groffen <grobian@gentoo.org>
   graphicsmagick-1.3.12.ebuild:
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index c126b2dac546..fddac864c959 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1,10 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX graphicsmagick-1.3.7-debian-fixed.patch 14493 RMD160 cbeccbd775d60da7f2b498540fdef8b08189eeb6 SHA1 2da7acdf46401cbc294170919c592cb842ab2afa SHA256 da17fbb6e30ca42b2d07871cc730de8f5ad61df9387cf22948fe1dcb72263b8c
 AUX graphicsmagick-1.3.7-perl-ldflags.patch 991 RMD160 e234224a939892f04a82b83e48ef475318183b28 SHA1 5e5c89d808bd3040945c64a60e1f8df35c03053d SHA256 f1ff9bf3009b1e353089ed27067bee2895b4e7f0d9e15100abdebac20bef8644
-DIST GraphicsMagick-1.3.10.tar.bz2 6754130 RMD160 1f2dadea29ceb549a398a4017b9f4979e18e3a7a SHA1 f44743a1aeb06c42edd8502ca8369c7282414d4c SHA256 89b0195e6c0634fd10c7a0a5799baca1e34351fed0dec9c021b6eb46f7b41ae2
-DIST GraphicsMagick-1.3.11.tar.bz2 6737154 RMD160 21d94a48b5a7e1382fd1640efdd6f634b4ed80c6 SHA1 1906055c61a3e43bd4bb40295c575ab102882b5d SHA256 afc33fda935753bfa8816302e1a41df74da076dbc27db4237c8017d537cb8fa0
 DIST GraphicsMagick-1.3.12.tar.bz2 6690493 RMD160 0a2749ee38a63c00c3ee6259ea7ea65c2bccc621 SHA1 6b8a414af162ad8679f2f04b10f128edc8ee3233 SHA256 4ceea8558c959fba847b2a4cd92232aac37f5f6a59dda234bc17ef83b90e57d7
-EBUILD graphicsmagick-1.3.10.ebuild 3410 RMD160 49be4204bc6217d0731ac95637e0e796281e0790 SHA1 93d5f56f37f229c672b1fe0b432157dacb5f88ee SHA256 5f8722d34b50a926ac86ccd193654aa873964a161d5e041494563d05e91cb079
-EBUILD graphicsmagick-1.3.11.ebuild 3412 RMD160 8ac8c74ff0c0778ca3ca2f548719d374a63578e5 SHA1 8ef586d6c84eefb928f87dbdf8800e6fd448c339 SHA256 e5e42e1e3b7b173aa97a04bba44fb1a27fb2c2209a0090cb5c5b18b8a24edad9
-EBUILD graphicsmagick-1.3.12.ebuild 3566 RMD160 5aea4c2a0fc211646dcdf2dc8ab8ecb0594c8084 SHA1 5ab63876aebd8db8881b1034256fbff17108e40a SHA256 18102cb8444e01dc15161bb075884e8dd1abc32eb0426d4f937db93a38c93e8b
-MISC ChangeLog 5636 RMD160 e31fd3770241fd9af733105a2ff5bc7a5c4be2b2 SHA1 7c63571c871e8f34c8e0e3fcb7f30655bef81cfc SHA256 ef09c588ef9f81a6af3f18ce5dcfd394bd8d97ad85222c255bd6edf9cd56f25e
+EBUILD graphicsmagick-1.3.12.ebuild 3610 RMD160 3bd78bd4c8807668c9e5f126cedff7f38396855c SHA1 9f0dec2f2984c203dedcf24f6e875fd3a32a5cf0 SHA256 44d136dd580a0374cecf1fdf67731d269c0779960cf358b113c838819ce5ab04
+MISC ChangeLog 5859 RMD160 00415b10cb0c5078a4866d955a6942fcff0b4a84 SHA1 957fb88079f678c079406763073b9e144c3b5dbe SHA256 855e0956bcf8b5fe17d302245bb21dc5eb7d66809f58a13e071242de9dc2e568
 MISC metadata.xml 979 RMD160 0a2a8648f7f56281f4db1f845c37865b3cbb64df SHA1 5ddee256c96236652983e56ed0a991e09b9b6c7e SHA256 73b9a3ba1b91780cdfbe20744ad4101170ad271d6df529621406382f59cbf29f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkupqKYACgkQ1ycZbhPLE2Cu/wCglSEzGAZVx9pHsCZiqgDBgfdH
+SawAoK+DsTK3sLGujp5tj0eBHJxY6Iq6
+=qGXg
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.10.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.10.ebuild
deleted file mode 100644
index e5f6c5824822..000000000000
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.10.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.3.10.ebuild,v 1.2 2010/02/20 19:05:28 armin76 Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs flag-o-matic perl-module
-
-MY_P=${P/graphicsm/GraphicsM}
-
-DESCRIPTION="Collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.graphicsmagick.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="bzip2 cxx debug doc fpx imagemagick jbig jpeg jpeg2k lcms openmp
-	perl png q16 q32 svg threads tiff truetype X wmf zlib"
-
-RDEPEND="app-text/ghostscript-gpl
-	bzip2? ( app-arch/bzip2 )
-	fpx? ( media-libs/libfpx )
-	jbig? ( media-libs/jbigkit )
-	jpeg? ( media-libs/jpeg )
-	jpeg2k? ( >=media-libs/jasper-1.701.0 )
-	lcms? ( media-libs/lcms )
-	perl? ( dev-lang/perl )
-	png? ( media-libs/libpng )
-	svg? ( dev-libs/libxml2 )
-	tiff? ( >=media-libs/tiff-3.8.2 )
-	truetype? ( >=media-libs/freetype-2.0 )
-	wmf? ( media-libs/libwmf )
-	X? ( x11-libs/libXext x11-libs/libSM )
-	imagemagick? ( !media-gfx/imagemagick )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use openmp &&
-		[[ $(tc-getCC)$ == *gcc* ]] &&
-		( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] ||
-			! built_with_use sys-devel/gcc openmp )
-	then
-		ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 "
-		ewarn "If you want to build fftw with OpenMP, abort now,"
-		ewarn "and switch CC to an OpenMP capable compiler"
-		epause 5
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.3.7-perl-ldflags.patch"
-	epatch "${FILESDIR}/${PN}-1.3.7-debian-fixed.patch"
-}
-
-src_configure() {
-	local quantumDepth
-	if use q16 ; then
-		quantumDepth="16"
-	elif use q32 ; then
-		quantumDepth="32"
-	else
-		quantumDepth="8"
-	fi
-
-	use debug && filter-flags -fomit-frame-pointer
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--enable-shared \
-		--enable-largefile \
-		--without-included-ltdl \
-		--without-frozenpaths \
-		--without-gslib \
-		--with-modules \
-		--with-quantum-depth=${quantumDepth} \
-		--with-fontpath="/usr/share/fonts" \
-		--with-gs-font-dir="/usr/share/fonts/default/ghostscript" \
-		--with-windows-font-dir="/usr/share/fonts/corefonts" \
-		$(use_enable debug ccmalloc) \
-		$(use_enable debug prof) \
-		$(use_enable debug gcov) \
-		$(use_enable imagemagick magick-compat) \
-		$(use_enable openmp) \
-		$(use_with bzip2 bzlib) \
-		$(use_with cxx magick-plus-plus) \
-		$(use_with fpx) \
-		$(use_with jbig) \
-		$(use_with jpeg) \
-		$(use_with jpeg2k jp2) \
-		$(use_with lcms) \
-		$(use_with perl) \
-		$(use_with png) \
-		$(use_with svg xml) \
-		$(use_with threads) \
-		$(use_with tiff) \
-		$(use_with truetype ttf) \
-		$(use_with wmf) \
-		$(use_with X x) \
-		$(use_with zlib)
-}
-
-src_compile() {
-	emake || die "emake failed"
-	if use perl; then
-		emake perl-build || die "emake perl failed"
-	fi
-}
-
-src_test() {
-	emake check || die "tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	if use perl; then
-		perl -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)' PerlMagick/demo/*.pl
-		emake -C PerlMagick DESTDIR="${D}" \
-			install || die "emake perl install failed"
-		fixlocalpod
-	fi
-	use doc || rm -rf "${D}"usr/share/doc/${PF}/html
-}
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.11.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.11.ebuild
deleted file mode 100644
index bc9d535b92be..000000000000
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.11.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.3.11.ebuild,v 1.3 2010/03/11 14:57:28 josejx Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs flag-o-matic perl-module
-
-MY_P=${P/graphicsm/GraphicsM}
-
-DESCRIPTION="Collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.graphicsmagick.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="bzip2 cxx debug doc fpx imagemagick jbig jpeg jpeg2k lcms openmp
-	perl png q16 q32 svg threads tiff truetype X wmf zlib"
-
-RDEPEND="app-text/ghostscript-gpl
-	bzip2? ( app-arch/bzip2 )
-	fpx? ( media-libs/libfpx )
-	jbig? ( media-libs/jbigkit )
-	jpeg? ( media-libs/jpeg )
-	jpeg2k? ( >=media-libs/jasper-1.701.0 )
-	lcms? ( media-libs/lcms )
-	perl? ( dev-lang/perl )
-	png? ( media-libs/libpng )
-	svg? ( dev-libs/libxml2 )
-	tiff? ( >=media-libs/tiff-3.8.2 )
-	truetype? ( >=media-libs/freetype-2.0 )
-	wmf? ( media-libs/libwmf )
-	X? ( x11-libs/libXext x11-libs/libSM )
-	imagemagick? ( !media-gfx/imagemagick )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use openmp &&
-		[[ $(tc-getCC)$ == *gcc* ]] &&
-		( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] ||
-			! has_version sys-devel/gcc[openmp] )
-	then
-		ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 "
-		ewarn "If you want to build fftw with OpenMP, abort now,"
-		ewarn "and switch CC to an OpenMP capable compiler"
-		epause 5
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.3.7-perl-ldflags.patch"
-	epatch "${FILESDIR}/${PN}-1.3.7-debian-fixed.patch"
-}
-
-src_configure() {
-	local quantumDepth
-	if use q16 ; then
-		quantumDepth="16"
-	elif use q32 ; then
-		quantumDepth="32"
-	else
-		quantumDepth="8"
-	fi
-
-	use debug && filter-flags -fomit-frame-pointer
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--enable-shared \
-		--enable-largefile \
-		--without-included-ltdl \
-		--without-frozenpaths \
-		--without-gslib \
-		--with-modules \
-		--with-quantum-depth=${quantumDepth} \
-		--with-fontpath="/usr/share/fonts" \
-		--with-gs-font-dir="/usr/share/fonts/default/ghostscript" \
-		--with-windows-font-dir="/usr/share/fonts/corefonts" \
-		$(use_enable debug ccmalloc) \
-		$(use_enable debug prof) \
-		$(use_enable debug gcov) \
-		$(use_enable imagemagick magick-compat) \
-		$(use_enable openmp) \
-		$(use_with bzip2 bzlib) \
-		$(use_with cxx magick-plus-plus) \
-		$(use_with fpx) \
-		$(use_with jbig) \
-		$(use_with jpeg) \
-		$(use_with jpeg2k jp2) \
-		$(use_with lcms) \
-		$(use_with perl) \
-		$(use_with png) \
-		$(use_with svg xml) \
-		$(use_with threads) \
-		$(use_with tiff) \
-		$(use_with truetype ttf) \
-		$(use_with wmf) \
-		$(use_with X x) \
-		$(use_with zlib)
-}
-
-src_compile() {
-	emake || die "emake failed"
-	if use perl; then
-		emake perl-build || die "emake perl failed"
-	fi
-}
-
-src_test() {
-	emake check || die "tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	if use perl; then
-		perl -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)' PerlMagick/demo/*.pl
-		emake -C PerlMagick DESTDIR="${D}" \
-			install || die "emake perl install failed"
-		fixlocalpod
-	fi
-	use doc || rm -rf "${D}"usr/share/doc/${PF}/html
-}
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.12.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.12.ebuild
index c811584f1cd1..23490d1053f2 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.12.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.3.12.ebuild,v 1.4 2010/03/21 20:21:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.3.12.ebuild,v 1.5 2010/03/24 05:52:29 bicatali Exp $
 
 EAPI="2"
 
@@ -83,6 +83,7 @@ src_configure() {
 		--with-fontpath="${EPREFIX}/usr/share/fonts" \
 		--with-gs-font-dir="${EPREFIX}/usr/share/fonts/default/ghostscript" \
 		--with-windows-font-dir="${EPREFIX}/usr/share/fonts/corefonts" \
+		--with-perl-options="INSTALLDIRS=vendor" \
 		$(use_enable debug ccmalloc) \
 		$(use_enable debug prof) \
 		$(use_enable debug gcov) \