Convert to multilib, bug #481300

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 106 insertions, 17 deletions

diff --git a/dev-libs/libpcre/ChangeLog b/dev-libs/libpcre/ChangeLog
index 27cd99396c04..aee3b91fb66f 100644
--- a/dev-libs/libpcre/ChangeLog
+++ b/dev-libs/libpcre/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libpcre
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.223 2013/08/06 12:33:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.224 2013/10/26 09:31:56 aballier Exp $
+
+*libpcre-8.33-r1 (26 Oct 2013)
+
+  26 Oct 2013; Alexis Ballier <aballier@gentoo.org> +libpcre-8.33-r1.ebuild:
+  Convert to multilib, bug #481300
 
   06 Aug 2013; Agostino Sarubbo <ago@gentoo.org> libpcre-8.33.ebuild:
   Stable for s390, wrt bug #453948
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index a7bc469a8f55..522d2958e150 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX libpcre-7.9-pkg-config.patch 1487 SHA256 d247cbd8bf85a4e898e0f7512e27bebaaf121e020fd2b85dc04eb6a3c041cd70 SHA512 eda853380d8612d7309c5fbd09d7de70582c1fdbb12fd31a835db5a3f866b4f085b66681b5481c83b2be4934b927d88c69798c8274e5228cb2532e58f99c886a WHIRLPOOL 5d63a40bda7e6b630e0a7b5e151b4c547eb284eac4ca8f4c644033dacb23ae20e0636a89f93fbd7fd4f5b083b5dcfffb3dc335cbadde5bab52cfab0370a7b959
 AUX libpcre-8.13-posix-regex.patch 1223 SHA256 d31e0eac4c6b24d57e89e56bc16332d1d0a349a0af2a6c6031134c2d1966d2f0 SHA512 8d0604c697338af698a241397be40fe0562e940bbba9b07ed20bfe0cb1197ca013da033ba07e6a9d8b7c67891ac5ab1da080c801e93cc502c529a5c98d0812e7 WHIRLPOOL 690b95676e59d36384801c11bbb1aa86b78d068754bdbac19f632b84c3236a561992339e46fd16c8a028fc397b9a5125757666d333b5b37801829f3b1030e9dc
@@ -27,23 +27,14 @@ EBUILD libpcre-8.30-r2.ebuild 2345 SHA256 3697c4064533fe7f287c2c7350c1215d2ea2dc
 EBUILD libpcre-8.31.ebuild 2476 SHA256 e1fd01e9d5c13bcfd6c5f9d619c3e64859cda7851fcb4ac900a4c72e05d20a7c SHA512 227838120b616874a7dfb805c0c66822a5eb366008c9c61b6acf89ad61e457289e63b8a7f1db2ee707452d3a04495c35c3c26ba2100b60185298135eb3e64e11 WHIRLPOOL d78a22c79eb4df3ad15f3ed0b448f1ee4cebab858aa1794d4f2e0c4682a4a996f112d83760c9d9c4673380e10f06261061862e8b5ba9458f0e899101044a8373
 EBUILD libpcre-8.32-r1.ebuild 2528 SHA256 de749b66123bc6d95fd777056246e53276de070041a5b80fe449ec5cf4beb68e SHA512 638b38801fc718c260a7a71098f6eeae5f6cd0de8d1b1a6868e4bc4d33b8a7a7d4c23808c5e4cf459a719578a708154a568c7f5a73be8f50c1d1a9292613e6a2 WHIRLPOOL bee6cc716be6d70537b843db7a44d4a90ee727735486f17409f05e3a257233ff1c7f39f27c7acc2c4a4ad61e40a9997171347344971e718c78e20dc4d97d875a
 EBUILD libpcre-8.32.ebuild 2525 SHA256 df939966377ae4b75df4fbbb2aa10417b1aac6d166530fc7b119abb626abda07 SHA512 030c3904eaf1c1275a3f2b3b28d3897a7462fcd4ff252f49f3ad0362d9db413679487aefa1d7a954d6f70aa6da073097939a7cedf31cc69c0da349dff67012ba WHIRLPOOL 8a6eed071401a8054417d0f4a050bea92dedd6873fec8df20482a9addfd4d9549f05ac0aae2c8306b1d53843cfefb40244338aa4700ccc1b122d6f4c1c999b2e
+EBUILD libpcre-8.33-r1.ebuild 3093 SHA256 29149a05e0a20c25f542f65be9d4ba90b6b73a397604fb72c7edc17cec63ad5f SHA512 55b01eae40e191a180d2db548ce42292bd9a5173de1c5f9afe6543d20d3aae596891b6515a1b668b0ea2c318cb4add4e55980f4d6a7296491e44407d8d717531 WHIRLPOOL f909e8790c41e84c150c23dd1d226249211ad223c360c15ba05b9eb40e517a8dcff9c2d070007a80a36de99ee32324b1323d327474c17b181ee6a983c5af0903
 EBUILD libpcre-8.33.ebuild 2544 SHA256 61e8977ffbc5d9f7b278a99baf317781fde1c17fed39f448d9e9082c914b5a06 SHA512 7b7792656b0c05672de2a6e652b1c5fa76289333407b433d0a1494db290c240e8cf21d49182b633f78c969e764df347526839d5b6c03f07b91ba3a3f7fa4fea2 WHIRLPOOL 3f48d2e9e099dca2236e10ed4c49b8ffbed1f88283dfc7a0f240e199167e77286b138e848a58ee4f551ffa6ef97d3cd9090d2ab1af439925b4acf267d2cecfff
-MISC ChangeLog 29880 SHA256 a1418e7642be2a857a303e77086fe9093c535d0b95363e3877ce0fe78ecfda46 SHA512 3b5160079953e8cb55f8820cf7be42da7861dd713c2243c9ac63caffc92edbe8acd6294f792212e64b7d71899e07c33562ae82ef6122754682bb5e1408478768 WHIRLPOOL a5003b4bb64ae977a1c3782bb72c2ff0a699e4b46d3aee9fe9312aad17677ad88634d2071d6fe306e43baee3671079773ec8a4da85df9174a20f8146ee7e62af
+MISC ChangeLog 30030 SHA256 0de31455315695f6f27839625b89fa90d3980095942ed5762cff8fa6bce398f8 SHA512 92f7157e36b41fd6d4ed2d8a6f4e42a35cdab53ad294a39dddbd714ec01a606dc6dc1683b8d6836626e3d9515d839f3a951c1e69dcb1597fec418345d3c7b68a WHIRLPOOL cca05438bedb11c47b7d2e2d2356d05cef9064b41fe89ce8d5a36958c98d75b73864a58ad3ccfee8c5b7a4683ebd02b54516c8fcd8373e3e2930f3778505e5d0
 MISC metadata.xml 1026 SHA256 bb540ffc66e93c6175107c2b017a7cbd2eba63c8dc2c42507a832635b8be5c6c SHA512 fa809405351bb1ec3d2af81a637f0221e2075c406556612de3aae251b77d720a091440f6ab383177b4a09722ec1f6757754d1dd4b942d57f45bac16a8d4189b9 WHIRLPOOL d03007b73990af2c9ff5e68b65a8f997410fccc953848b73eaaf8d35ad0db7fed04b28b8767e6bb02541439796f62a8fd9eff06e9840b99fa4ed3fcacf0bc836
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSAOxOAAoJELp701BxlEWfW9cP/RLyaktoSIXCcGbfRfoTw42y
-LiDsPJgfaKQSyiRjgGcODEQDOtgZMBVzpibB3Uy1+Ppft3iIbISu4yDGPzA0WPrH
-ukkxa41y7FdzkCCtpNk2GyZFDj7eSJQkXGLVLL5zsUXNiyZ1AzbfdFiZzu63tNGr
-pXR2NqULBU+BfZx67QRuF78G5KI8V4vHqEk7bW/agw5KNxsFU8gNTlm5FtiSYD0z
-vGfSmhNn5raaLKrTzsCDD1LbwPzos9ljuwAypxUUNgKRhZaOrCTM3s0Ag7F92IX4
-wVecehwuc8qhHf0NaTjXTgI3Y0lQJ/EV/Iz0MZmxpuotmtXSgDI50bDm6ta7Eewp
-NfnhU/z58CX6nc5fkAeW6o6RhA8RF5hTFC6XzM/xIPSe1OVl7w8zBFyssflb2M0c
-vKmev3jvMz8pFvuLgMM6TRNZVX4aut2ug4U8miY6ua4NZUdNnxA4pbphYrJOS1Jw
-s7bAfZZ7yWfHpCdW7Rp5rx9IcpMr3rSEzrm/lGHliTrFgl1W5kcvWaA/FAYASF4J
-oiA5KAtv4ybL+KeQknQN5S7XL/Hulbz9QWe3+ZgWnHX8MqNxi9Begvn2cupiZVbg
-C9otmGy6FDX1PnGQg57gpLuZ2l6/0Ibi1sh9DZT/LQ7WCKziMHZxTNwx6yd6JWm/
-42ulQrtcnE4+f+BbWWAd
-=xllG
+iEYEAREIAAYFAlJrjA4ACgkQvFcC4BYPU0q1VwCdHb4Mpkxi5cOb15SHD5399Gwy
+p6AAniH+PM3DhSE7O32QlBV5oq79+f/y
+=S4Xl
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libpcre/libpcre-8.33-r1.ebuild b/dev-libs/libpcre/libpcre-8.33-r1.ebuild
new file mode 100644
index 000000000000..aaca628dc81f
--- /dev/null
+++ b/dev-libs/libpcre/libpcre-8.33-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.33-r1.ebuild,v 1.1 2013/10/26 09:31:56 aballier Exp $
+
+EAPI="4"
+
+inherit eutils multilib libtool flag-o-matic toolchain-funcs multilib-minimal
+
+DESCRIPTION="Perl-compatible regular expression library"
+HOMEPAGE="http://www.pcre.org/"
+MY_P="pcre-${PV/_rc/-RC}"
+if [[ ${PV} != *_rc* ]] ; then
+	# Only the final releases are available here.
+	SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
+		ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
+else
+	SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2"
+fi
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
+REQUIRED_USE="readline? ( !libedit )
+	libedit? ( !readline )"
+
+RDEPEND="bzip2? ( app-arch/bzip2 )
+	zlib? ( sys-libs/zlib )
+	libedit? ( dev-libs/libedit )
+	readline? ( sys-libs/readline )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
+RDEPEND="${RDEPEND}
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r2
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	local pc
+	for pc in *.pc.in ; do
+		echo "Libs.private: @PTHREAD_CFLAGS@" >> ${pc} #454478
+	done
+	sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die
+	elibtoolize
+}
+
+multilib_src_configure() {
+	[[ ${CHOST} == *-mint* ]] && append-cppflags -D_GNU_SOURCE
+	ECONF_SOURCE="${S}" econf \
+		--with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT) \
+		$(multilib_is_native_abi && use_enable bzip2 pcregrep-libbz2) \
+		$(use_enable cxx cpp) \
+		$(use_enable jit) $(use_enable jit pcregrep-jit) \
+		$(use_enable pcre16) \
+		$(use_enable pcre32) \
+		$(multilib_is_native_abi && use_enable libedit pcretest-libedit) \
+		$(multilib_is_native_abi && use_enable readline pcretest-libreadline) \
+		$(use_enable static-libs static) \
+		$(use_enable unicode utf) $(use_enable unicode unicode-properties) \
+		$(multilib_is_native_abi && use_enable zlib pcregrep-libz) \
+		--enable-pcre8 \
+		--enable-shared \
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+multilib_src_compile() {
+	emake $(multilib_is_native_abi || echo "bin_PROGRAMS=")
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
+		install
+	multilib_is_native_abi && gen_usr_ldscript -a pcre
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+}
+
+pkg_preinst() {
+	preserve_old_lib /$(get_libdir)/libpcre.so.0
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/libpcre.so.0
+}