sci-misc/apertium: Fix detection of libpcre, #440632

Package-Manager: portage-2.2.0_alpha179/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

5 files changed, 75 insertions, 13 deletions

diff --git a/sci-misc/apertium/ChangeLog b/sci-misc/apertium/ChangeLog
index 98cfdec0b917..3131dd4a1d8f 100644
--- a/sci-misc/apertium/ChangeLog
+++ b/sci-misc/apertium/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-misc/apertium
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/apertium/ChangeLog,v 1.6 2012/05/04 07:50:52 jdhore Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/apertium/ChangeLog,v 1.7 2013/06/14 06:52:28 jlec Exp $
+
+  14 Jun 2013; Justin Lecher <jlec@gentoo.org> apertium-3.2.0.ebuild,
+  +files/apertium-3.2.0-libpcre.patch, metadata.xml:
+  Fix detection of libpcre, #440632
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> apertium-3.2.0.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/sci-misc/apertium/Manifest b/sci-misc/apertium/Manifest
index e2a3079f53bc..668db5097d64 100644
--- a/sci-misc/apertium/Manifest
+++ b/sci-misc/apertium/Manifest
@@ -1,6 +1,17 @@
-AUX 3.2.0-datadir.patch 1315 RMD160 94454e4038bb991c6136e6494b2e078df2ac2806 SHA1 941d60fc4c66c974fb058c8f8c2090ed639b7e42 SHA256 c15ecf476e2b8fb1382634cd94b25247897e2366d8d54f8ae2c0325d5c98bb5d
-AUX 3.2.0-flags.patch 2163 RMD160 51f1e973e0f61c5d500fbb1906864387e25d23b0 SHA1 6401d4b282f83036f2fe3f97bac5f2689ba5e5ad SHA256 4603b544b2cc7d7b48945453f2a3c462e5a3f175ee834dcd108d94de8db9bc81
-DIST apertium-3.2.0.tar.gz 767311 RMD160 85d444780558dc1aa19f36d250152bb9ee695c03 SHA1 1e784dcb20cf99215c04c642b62e1ff35ef76dba SHA256 6ce2fdc85da5d1e50d69da2e50cc97a87b689476f2c83417765636d9a4b7e9ac
-EBUILD apertium-3.2.0.ebuild 722 RMD160 235a6686556145f58f1b2be68991660f3989cda2 SHA1 ff0bf51d0c38e3fe6de2c06bdc0d48b0abfced42 SHA256 76e01a96c0db7e85dab489f00d7236b3e3e232a5924c259e4d4aee257f5d4ca4
-MISC ChangeLog 1041 RMD160 e1df01893458cc96c1ae4dfdcbcb39d9f2e179f2 SHA1 7fefe4c2d59f5abaca9a5e7830cbcdae9a7f0d2b SHA256 a7dcb9c25947b8507e21c0c7240a013aa0242d9361088df2c25a553d8b09ab29
-MISC metadata.xml 293 RMD160 7b9798535e877179cf0057d0706b282008021fc1 SHA1 7bb71673d2cc5ddeaa2e3553752f026128fe0b80 SHA256 b254b64d7faa178e3424db5846f80f32f526c0f176caa9b5c891adf5d67e3ca7
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX 3.2.0-datadir.patch 1315 SHA256 c15ecf476e2b8fb1382634cd94b25247897e2366d8d54f8ae2c0325d5c98bb5d SHA512 51d4950ee82298a3b77a83e625c7bf788bdbc15b0fa16e1b5e0b57a8be1c28d5a499a1d3fa2436b7cdeedf397803b6ca6fe6740871b8c3a9687b57b3182f9e6a WHIRLPOOL 298b1c55a9216955910fa6716d28a07cab3edbc6cb86332e33a14f349444b5bdd791aa0321c6883ea5ad16a93e5309e6936061c5b65f455afb0b8de7e0b3769e
+AUX 3.2.0-flags.patch 2163 SHA256 4603b544b2cc7d7b48945453f2a3c462e5a3f175ee834dcd108d94de8db9bc81 SHA512 25a1e8687c38091b249fbbef4dac01c95f4b446ad7e3ffd829b8803d056e34ec49057855af80f8ec578d83894234ab0c87b900daec759a6fd3ba8ae3fc736fce WHIRLPOOL a247d99fac478f2289b69f955272de96ed25695224dccf57ede3fba0ebcf3f1ef39dd5a914712a1a5f27e7b69fc3bc0f8c38bd889b206d3a260e961918ab8aac
+AUX apertium-3.2.0-libpcre.patch 1480 SHA256 ce62b641ea49e838d22f716eb1ff40c99bfefd0a8ff04d57589c901317b689ea SHA512 e8816e99ea2e2c0c027e498d77bf6948002f84781a3af77bb6cf570dfbf29a4a111b94abadfd4b8e4c35737c17abc51c89d880ee938a71fd7a2e57fe88ac081b WHIRLPOOL 768d84121d1081182223835ebd18478c2d76e65776253cf236f2d6e0816c00cc47367620a9a96d87890965cfd6320c06cb5e3e9d14f5df4627977e51c397df28
+DIST apertium-3.2.0.tar.gz 767311 SHA256 6ce2fdc85da5d1e50d69da2e50cc97a87b689476f2c83417765636d9a4b7e9ac SHA512 ec80d72480e414eb9a169241d0921b21009dde7c1da9a773f500f16ac785741be1f4a221c25b3b32e7847405f76e93b5feadb6f541170c0742718e27dfa1fb25 WHIRLPOOL 44b8c6fcda7abe363540d1b3ce344322bec60ff1b822ffb5f228a50b156f9660798a9aafa3c9ccf25652cf858be32efb41b06d5d05e7d8fd3284db7d81aac4a4
+EBUILD apertium-3.2.0.ebuild 809 SHA256 b29f782317ad942caafcc1acccaba6fa05d956c0835c76a5a17f5ca23b23a13c SHA512 bf18ca7bba88b6313db43af50b1517ca6f9cd8a570ae005204aac5c0b2b7286d05660b0ba92dda7267f6d2ed060ef471011bea0268cb4614c9085ce3ec8f1c61 WHIRLPOOL bd9f6f963eff60e26e6b4b143ca63ceb1748fa738af0d2ab372bb0fbbde2bc2b8ff0b89fad2f5b3f49896c3632faf57dabe36629164dba119e57ee990e047af5
+MISC ChangeLog 1199 SHA256 02cf3ea216478118fea78ff32f9fe0d2704a77e6bf9c76d3dbc96fc6926879dd SHA512 9f0b5ecb5afb26e8274879bdd0bdb6d1261ba3e2a3d5944d8a6d5e83ffa169c7f5eb026f37e2396ef396d82fa7fde2795456364080fcdb9980e29c5254e73006 WHIRLPOOL ed1191076cfc0a2845f1fc7694845f05f35f52f04c7007f4c120780c9fd2d3a030ab29f6dee0f1392702a98eaf4c1567bb3006442cad81aca18af958b01d1a3a
+MISC metadata.xml 295 SHA256 bebb8563fe7a9d882d60d2f6e6918a97ac248e24bd59eef456cba77c788e2527 SHA512 c8cf2d828fc5885b984f920fb05166fc895f0ed1370a490de5b768ec96c21ae2d19944fca384ebde6d02b17663da40d188cd96c5c346bfbb39a5f786de90a3aa WHIRLPOOL 3edcb659dfc1ce014cb02982dd66d691539a165e5a27b16364f0095303b099c02b85cf101c12976d56f21e1b6ba1a92e3a37909d608df7aebec0b55c71db1f50
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iEYEAREKAAYFAlG6va0ACgkQgAnW8HDreRaOzgCgu9fEbtTmjHhvn/YqdxzP5TL4
+WPkAoJZ0VFuIma7Oor18IrXJ3V7TtjYa
+=JAfn
+-----END PGP SIGNATURE-----
diff --git a/sci-misc/apertium/apertium-3.2.0.ebuild b/sci-misc/apertium/apertium-3.2.0.ebuild
index 76d96b49acde..ace70d4163d9 100644
--- a/sci-misc/apertium/apertium-3.2.0.ebuild
+++ b/sci-misc/apertium/apertium-3.2.0.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/apertium/apertium-3.2.0.ebuild,v 1.3 2012/05/04 07:50:52 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/apertium/apertium-3.2.0.ebuild,v 1.4 2013/06/14 06:52:28 jlec Exp $
 
-EAPI=4
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
 
 inherit autotools-utils
 
@@ -26,6 +28,8 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PV}-flags.patch
 	"${FILESDIR}"/${PV}-datadir.patch
+	"${FILESDIR}"/${P}-libpcre.patch
 	)
 
 MAKEOPTS+=" -j1"
+AUTOTOOLS_IN_SOURCE_BUILD=1
diff --git a/sci-misc/apertium/files/apertium-3.2.0-libpcre.patch b/sci-misc/apertium/files/apertium-3.2.0-libpcre.patch
new file mode 100644
index 000000000000..29a6a5483bb8
--- /dev/null
+++ b/sci-misc/apertium/files/apertium-3.2.0-libpcre.patch
@@ -0,0 +1,43 @@
+ configure.ac | 28 ++++++++++++++++------------
+ 1 file changed, 16 insertions(+), 12 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0bfca01..2d8ec3b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -183,19 +183,23 @@ AC_CHECK_FUNCS(strcasecmp)
+ 
+ if test x$(uname) != xDarwin;
+ then 
+-AC_CHECK_HEADER(pcreposix.h,
+-  AC_CHECK_LIB(pcre, pcre_info,[
+-  LIBS="$LIBS -lpcreposix -lpcre"
+-  no_comp_check=yes],
+-  AC_MSG_ERROR([*** unable to locate pcre library ***])),
+-  AC_MSG_ERROR([*** unable to locate pcreposix.h include file ***]))
++PKG_CHECK_MODULES([PCRE],
++  [libpcre libpcreposix libpcrecpp],
++  [LIBS="${LIBS} ${PCRE_LIBS}" no_comp_check=yes], [
++    AC_CHECK_HEADER(pcreposix.h,
++      AC_CHECK_LIB(pcre, pcre_version,[
++      LIBS="$LIBS -lpcreposix -lpcre"
++      no_comp_check=yes],
++      AC_MSG_ERROR([*** unable to locate pcre library ***])),
++      AC_MSG_ERROR([*** unable to locate pcreposix.h include file ***]))
+ 
+-AC_CHECK_HEADER(pcrecpp.h,
+-  AC_CHECK_LIB(pcrecpp,pcre_compile,[
+-  LIBS="$LIBS -lpcrecpp"
+-  no_comp_check=yes],
+-  AC_MSG_ERROR([*** unable to locate pcrecpp library ***])),
+-  AC_MSG_ERROR([*** unable to locate pcrecpp.h include file ***])) 
++    AC_CHECK_HEADER(pcrecpp.h,
++      AC_CHECK_LIB(pcrecpp,pcre_compile,[
++      LIBS="$LIBS -lpcrecpp"
++      no_comp_check=yes],
++      AC_MSG_ERROR([*** unable to locate pcrecpp library ***])),
++      AC_MSG_ERROR([*** unable to locate pcrecpp.h include file ***])) 
++  ])
+ fi
+ 
+ 
diff --git a/sci-misc/apertium/metadata.xml b/sci-misc/apertium/metadata.xml
index 77c01f62e274..68024782b0da 100644
--- a/sci-misc/apertium/metadata.xml
+++ b/sci-misc/apertium/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<longdescription lang="en">
+  <herd>sci</herd>
+  <longdescription lang="en">
   Apertium is an open-source shallow-transfer machine translation
   engine and toolbox.
 </longdescription>