Migrate changes from Gentoo Prefix. EAPI3, KEYWORDS, mint CXXFLAGS, add EPREFIX to...

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

diff --git a/dev-libs/libpcre/ChangeLog b/dev-libs/libpcre/ChangeLog
index 35b268cb34c8926e00b4e3a97a59c63879cf1385..e7baa705a232415cd8d5a2440b5a662aa2e88463 100644 (file)
--- a/dev-libs/libpcre/ChangeLog
+++ b/dev-libs/libpcre/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libpcre
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.181 2011/04/09 13:46:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.182 2011/08/09 18:31:50 darkside Exp $
+
+  09 Aug 2011; Jeremy Olexa <darkside@gentoo.org> libpcre-8.12.ebuild:
+  Migrate changes from Gentoo Prefix. EAPI3, KEYWORDS, mint CXXFLAGS, add
+  EPREFIX to configure
 
   09 Apr 2011; Raúl Porcel <armin76@gentoo.org> libpcre-8.12.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #358791

diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index 204a710e2494cf254cff3bf583603cf4034b0426..1b480379f379dcc8aa2e9c0746eaa356c0f6c541 100644 (file)
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libpcre-7.9-pkg-config.patch 1487 RMD160 b9e583ed8776a16cc1ec2c6dbd5c0153d6fdbf88 SHA1 57d60963fd635883a7eacdbed411405a28751fec SHA256 d247cbd8bf85a4e898e0f7512e27bebaaf121e020fd2b85dc04eb6a3c041cd70
 DIST pcre-7.9.tar.bz2 861580 RMD160 e7ccae1fe3d2cf3ff3264c6e6ad3486c64fe1cec SHA1 a4a34f71313ac042455355c01ad851791971a7fa SHA256 40a13a9759f1de5b16bc2f0d47b6aa5f0ec010325646922f54b013c040dcd740
 DIST pcre-8.02.tar.bz2 956462 RMD160 5a29c3d5e61ea877a6e3ab2b9e70f426c7f34771 SHA1 2cf2f7f04988813c7ce45c43eb934f3b8b1c3b34 SHA256 a4759036d9c3e1773e8b680827b17b843f724ef9021744db92b8dd35ebac4ebd
 DIST pcre-8.12.tar.bz2 992502 RMD160 ec7978604cdf92d8dbd98e0d0c360fe35eb62021 SHA1 2219b372bff53ee29a7e44ecf5977ad15df01cea SHA256 c63070d461edc451ec9457f2324e152a531e907d5c5d2d8f8121e725acd1aeec
 EBUILD libpcre-7.9-r1.ebuild 2219 RMD160 d078f40adb1033becf323f99c9df6b3400a1e3fd SHA1 bfb5fd3e9f9363f716a07a3fb6f4c67143b2f0c4 SHA256 fc0cf38ae0747fdfef18fddeece0884f8b581b9dc3bdc547d585ac87a7ebb2cb
 EBUILD libpcre-8.02.ebuild 2002 RMD160 cf478287ed467c9a0d4e336d5af51e33a62bf642 SHA1 e1173cdec48309c387a7461dcac8f8a907fd12be SHA256 1d2ecc5a099793dde0af22358aa1287b7b6a6fc5690c482dfc3e684a2636c68b
-EBUILD libpcre-8.12.ebuild 1812 RMD160 9294c24e0edb7dbb5e8d3419ad1d3a26b0552cd8 SHA1 c1abb2c9e96b47d0e05d3784baf7e21848dbe44f SHA256 02a850d69d547ae8578a0c2b9e9717f9e22d023f5eb60b1cd6162d009d36e72b
-MISC ChangeLog 23692 RMD160 7acdc7c8e3221d32bb7a522c92b22318d35a0f70 SHA1 53b7b49214a548540eba3707fd770446d358fa30 SHA256 21cb5defbffe723e93b97c4ea3f29b9b888ef781a8310119cb887bb45f96e2ad
+EBUILD libpcre-8.12.ebuild 2055 RMD160 016b220208b92980fc9293af651dc29a27d4d51f SHA1 c7a3f50fc07b60300cc999fbf6bf96648598fc9a SHA256 06d6bd9bea9fa62d1f0c9badc7ce050d91bda100d355b0ff3c477fc0ab0b3eeb
+MISC ChangeLog 23862 RMD160 4af496b94a39dff651d52a8333f02b659cca2bfd SHA1 58f47a88c86a4c90d296a71bf2bd27527e953ce0 SHA256 dbde2ef9a81343fe8e536a516fc07ac580e0c03cc3404fa73e970cf8c80eeaf5
 MISC metadata.xml 350 RMD160 5224f17e5a48e04717eabc1c716d640850bb9b38 SHA1 cdbd6adbdc7271ef217001a3fd7616ac5f491feb SHA256 43fd555785f7e73e17e21727705df12cd8b00fae32e13fc4dca22a0135b9c770
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk2gY0MACgkQuQc30/atMkDBGACdEIQ3TZh6xfL7br9H6F7UQNvM
-8G4AnAvUsDKAOMZc178L/XpYiaEgbdXh
-=tsHY
------END PGP SIGNATURE-----

diff --git a/dev-libs/libpcre/libpcre-8.12.ebuild b/dev-libs/libpcre/libpcre-8.12.ebuild
index 1c46eb91c76878bd04876fcd2782ec4b39ff1158..6dde1254abe457d2a687a8b95196312b4870cbfe 100644 (file)
--- a/dev-libs/libpcre/libpcre-8.12.ebuild
+++ b/dev-libs/libpcre/libpcre-8.12.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/dev-libs/libpcre/libpcre-8.12.ebuild,v 1.7 2011/04/09 13:46:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.12.ebuild,v 1.8 2011/08/09 18:31:50 darkside Exp $
 
-EAPI=2
+EAPI=3
 
 inherit libtool eutils toolchain-funcs
 
@@ -20,7 +20,7 @@ else
 fi
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +cxx unicode zlib static-libs +recursion-limit"
 
 RDEPEND="bzip2? ( app-arch/bzip2 )
@@ -37,6 +37,7 @@ src_prepare() {
 }
 
 src_configure() {
+       [[ ${CHOST} == *-mint* ]] && CXXFLAGS="${CXXFLAGS} -D_GNU_SOURCE"
        econf --with-match-limit-recursion=$(use recursion-limit && echo 8192 || echo MATCH_LIMIT) \
                $(use_enable unicode utf8) $(use_enable unicode unicode-properties) \
                $(use_enable cxx cpp) \
@@ -44,9 +45,8 @@ src_configure() {
                $(use_enable bzip2 pcregrep-libbz2) \
                $(use_enable static-libs static) \
                --enable-shared \
-               --htmldir=/usr/share/doc/${PF}/html \
-               --docdir=/usr/share/doc/${PF} \
-               || die "econf failed"
+               --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+               --docdir="${EPREFIX}"/usr/share/doc/${PF}
 }
 
 src_install() {