sci-libs/itpp: Add patch for pkg-config file creation

Package-Manager: portage-2.2.0_alpha118/cvs/Linux x86_64

5 files changed, 43 insertions, 10 deletions

diff --git a/sci-libs/itpp/ChangeLog b/sci-libs/itpp/ChangeLog
index 4ab8a8f6214b..b2522bd10596 100644
--- a/sci-libs/itpp/ChangeLog
+++ b/sci-libs/itpp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/itpp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/itpp/ChangeLog,v 1.114 2012/07/17 07:51:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/itpp/ChangeLog,v 1.115 2012/07/17 08:11:22 jlec Exp $
+
+  17 Jul 2012; Justin Lecher <jlec@gentoo.org> itpp-4.2-r1.ebuild,
+  itpp-4.2-r2.ebuild, +files/itpp-4.2-pkg-config.patch:
+  Add patch for pkg-config file creation
 
 *itpp-4.2-r2 (17 Jul 2012)
 
diff --git a/sci-libs/itpp/Manifest b/sci-libs/itpp/Manifest
index 0f4a8157b6ff..1a7af90bb003 100644
--- a/sci-libs/itpp/Manifest
+++ b/sci-libs/itpp/Manifest
@@ -5,19 +5,20 @@ AUX itpp-4.0.6-gcc44.patch 2068 SHA256 ac0696b9b33a040fa4d8e670475fd8d922b6b99ec
 AUX itpp-4.0.7-fastica-fix-endless-loop.patch 4009 SHA256 f433a5c762a1461065f51b1d99537f7c782bbc9190480ac509593bb23bbf4696 SHA512 f5724b84bff3474f5d8ebaabd5eb8c42b2f2842cd14282510c4d8554b31fd493c9a08647a035dff81ae8ff8f385c280ba2735a95a7f06ab4cc448c945bd78877 WHIRLPOOL 33b7e3bc5ac62ce7988957f62fa0bb797d38bce8d2241b4effd7cade4c217dcb915162f2f73442604ee962899a5eba922404507304f4a1e90396bc051d469f31
 AUX itpp-4.2-automake-1.12.patch 405 SHA256 e7540d79d4fa907777b8826f29d66f49819c8c598a40648944d2928b07e70697 SHA512 9202f6bafd384cd388d2628a746fac1f67322589561805cecf65afdef8fa6b05c8ac16ec71c885c8eeb9d5ba60a54cc78994c8fffe527b245c697ddb6ad678bf WHIRLPOOL cd0e288d73a97cea84196300393be028963e5b43d156b6f7c6cb3c4c7a3bcd484d3a1d8c5d65c644548bc0bebe6bbdd79f25319bd2d05b28de4556a1939ef947
 AUX itpp-4.2-fastica-correct-dim.patch 932 SHA256 922f9f4c1780b98f06959f72d423b5820cc03607e34d98aff8e426f473c3bebe SHA512 16ea7f251623a1454925858e598fc90e8beb365c7776a81cdaaecc58cb9ce687cfed5bc859dc3ffbed8f9380c394b8adcab6ecfface7fd789d58657749b0fda1 WHIRLPOOL dce36eb93bd4efdb5d0c9a75009bca772e26bfa324b5a5efa9b7849705d401ca264d241499f4c818203694b1610e5aa1771f96573f16d00f508f684eaf862fab
+AUX itpp-4.2-pkg-config.patch 1057 SHA256 32185a1b0b8f71b29933613a3c0d4cfc8e6ec99f7551667a6c3dd5b4c232a9f0 SHA512 d19fd64fa9d346a72a9745e9dead5e563c7348eefba69e3dffe8ba252919b4ca2b1e2039263b73147ff04ae0eedb29d3875b3081b04c140085102833e772e0d3 WHIRLPOOL 55776afa13fe61ecf3a8f546fff5e887593409774ef71ca69fb7522f5c208df32904fd2a03f0ce11c9fe06f443e303ddf96410e0c0a5174297b4189a3b1713e0
 AUX itpp-4.2-test-fftw.patch 543 SHA256 bd02d0d9de2d559ac4317d1bfc9faa5f81a6056a44040859cebe955471f442d2 SHA512 e4a5c7ecf1ff0bc6a14d8a9658cd0f0610db5652e7515dddad0579ea5fccdd083360755c9acf51073973b7540176d5eca6a1cdf0da48c9df08aaf9278a1149c9 WHIRLPOOL ed3191d1011756537694560323ab95cb34e2f4d2fe9ab502044fba3aaf28ca7b8b5343995165f6d8fb616fdcbb4e6b949d765f7d04d9b623f3549434c21e8800
 DIST itpp-4.0.6.tar.bz2 976917 SHA256 a0d5fb03149c361b98556b4736980a4eae4de14a550153f343c60fd29ac5ef94
 DIST itpp-4.2.tar.bz2 1050157 SHA256 732c7de212dddfd8669ef3e4d164d5d9a2f81302f3921ddd0176cfa8c49c556c SHA512 319296c5d929201fcdfb32ad59b3304d3620d921c1d08feb1d138fecb37305f71f825b4fc45d563ba817eb6ac92fb9223c32d4260013ef1d30a2e1e8edf52a2f WHIRLPOOL 4af9e5326b9a94013c173d650ac5c92105e21731ef6398e707808219831158bd995060a860d31d6874a56b96123bb5e646600f45ee6f4fb185d3e9c1b349ddc7
 EBUILD itpp-4.0.6.ebuild 2269 SHA256 95a24f5d97cf818d7eafd6f7c970a74beb88cc8dc5645cb824ad93c0db17c8b0 SHA512 0d05b36ee6030e6838b9913dc39512780e0d13d8f491f0b27b2c54f0ee4b14aa82ebb6698094a68198ddeb5b4771e6b0af9f6c5c5985d24f92a71b887379ce9e WHIRLPOOL e5193b55189bca92310805864db9c8d747227deb50ef6e76f0f6bc223813a6588eef6c8b6abcd16fe7625456fb2d8f06263cf5863295cff8c21af32a0a44f1fc
-EBUILD itpp-4.2-r1.ebuild 1813 SHA256 2ff7af3c4a4e06ae66401f4264770ff2425806b7e75374fe0b9dd78d8eb67b0e SHA512 df5fc69d525ea8d8ba2a6aca02f065ea2c2c47be94cfaf499de1235fffaa7c682615079e1cfb8a759051581004cd31db0dd64276bf6895853187705136a6ecda WHIRLPOOL 3123928460b1d4e788af20965a60aa057e4a56ec8dc42f46169476503b8988a91e19aa1fd695af0a940ac39880940589c2ea60aa8bb92528be162f843f1feda6
-EBUILD itpp-4.2-r2.ebuild 1805 SHA256 e1c99b3115c91d3cfa4f91a744990cb5865e48e53d3c5fb60440c1f3e4eacb5c SHA512 973805871f6146a641b12c19ba2cc564271b2b8959c06c8952bf47e229cdd1b312ac113845df7617fafe1907e66e7bfbbedb05932abd96a747c1f367520e00fc WHIRLPOOL 9dd08f729a80109ad7d4551837e68cfadcc0d3d1929c9f3be8992ffbac630e6885aab87c121cfed39c1e160e21de16e17a50b46e4771e75683afb1ec9f7e6afe
-MISC ChangeLog 16970 SHA256 5241d6196effb3f787e8f5d9affd3bfef6d1cfdef543c175cb3ecf5cbea2b22c SHA512 ceb58dcd177e54de087263cac72e84dea91e73a0964fadaa3b24ccc702bbb1c8beb8e218107a0262eca012e65c2e8f0daed7092bd7eaab64d1da2dd90646f9e9 WHIRLPOOL c66de4c1815ccb7d941ace8cf5a0f5d82325b03444833e95006dd24fca53adbb1dd6ee766ee1109fc6a8504a4b8f174a9b7e8f1181050c204c54dde335804e55
+EBUILD itpp-4.2-r1.ebuild 1773 SHA256 dc1a339cf7a83abbd81dc83071d2d94a2ad95a78951b186606a071450434931a SHA512 80a640c508de708bcb76b896ecf2ca4bbd36c48c3cf1d41b0809d144866375bccc15727350354fe51b71bfd06714ede6f3269ed09eda0191a1e6ac9a50dbd23d WHIRLPOOL 5ead4454b2c43595b8562c02c38bb4b47f2e53572431c2a062e623cbd033a7965f8b3c875ba0ba6e70a3cee0888582ca999898440feea57144862e6166742b61
+EBUILD itpp-4.2-r2.ebuild 1882 SHA256 adfa3d03e1b23619bb4ec77173dbc421cb5fddb8117e7b318db83a78dbc60c63 SHA512 de3aee604bf3fede01a24159ec6e431a4606ec8fa169aac7c75fe4ce533f4a1ec337ceb80b9554c1868cd88359d7fac341245916e2bad61106354797cca55911 WHIRLPOOL 9ac2e8fd7c22efeb68fb2cb39331d3d800cfd10aaed9bdf57d74c3ccafdc0df1f7508d5c08f11942baeda4ab4d0d18325c2fe8124285071db96d2199fd16c3a3
+MISC ChangeLog 17135 SHA256 6c125b0ab44f9d9688c6aa5caa33ac26ef2f5d0670ccdc87a18f7586dc735e69 SHA512 13bfe72a411eb10dc3f2a182d58002cd6e0cb2622acce77a017ee0eb8c8015504182977c17073d59ae092a52e76c4c339594a955e92c1163c59365448bccd7ab WHIRLPOOL 40f8868b9d2ffde9a2c325f61233c98b3bd423d7c3fd925e908be4f2cd340a9d5aeffa73442fa6d3deb7a5042e1d54c784bac04718f3c62bc4146e4680485d80
 MISC metadata.xml 597 SHA256 a287a436e3d5911736b3243805159a86e981617cf8375cf52fad438deac044f5 SHA512 2ab7f64f589bb34db82ef347da6b621de1ee91e32a13a0a7dec0df64ff102a1246bcdf59d89f468c6499aa7c1600736509757818397a2d647df857a6a8b00db0 WHIRLPOOL 3e81d40451c2a402f1cbbd847f3567c17dd1e2731f5e83524bcd646835413d8430bbea0b6c201006979379941d7bf12c52a3c5b0d7d9aa3f24f97f88efd2cdd4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 Comment: GPGTools - http://gpgtools.org
 
-iEYEAREIAAYFAlAFGY8ACgkQgAnW8HDreRZHCwCfR67gFUisFc7JxJcS5TQTBFXQ
-HGsAnAzDDhrxv7UBAw1JtHsYtJJbURcI
-=noY/
+iEYEAREIAAYFAlAFHjcACgkQgAnW8HDreRaMawCg0iCS1SuA2rHH1WulLDstYGuZ
+40wAn1vz3RNnfNj8PiIYKG9qB3qLNzvG
+=qbjR
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/itpp/files/itpp-4.2-pkg-config.patch b/sci-libs/itpp/files/itpp-4.2-pkg-config.patch
new file mode 100644
index 000000000000..5a18952707bb
--- /dev/null
+++ b/sci-libs/itpp/files/itpp-4.2-pkg-config.patch
@@ -0,0 +1,27 @@
+ configure.ac |    2 +-
+ itpp.pc.in   |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4f06171..d3d7b76 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -322,7 +322,7 @@ test "x$FFT_LIBS" != x && LIBS="$FFT_LIBS $LIBS"
+ CPPFLAGS="`echo \"$CPPFLAGS\" | sed -e 's/  */ /g' -e 's/^ //' -e 's/ $//'`"
+ LDFLAGS="`echo \"$LDFLAGS\" | sed -e 's/  */ /g' -e 's/^ //' -e 's/ $//'`"
+ LIBS="`echo \"$LIBS\" | sed -e 's/  */ /g' -e 's/^ //' -e 's/ $//'`"
+-LDLIBS="`echo \"$LDFLAGS $LIBS\" | sed -e 's/^ //' -e 's/ $//'`"
++LDLIBS="`echo \"$LIBS\" | sed -e 's/^ //' -e 's/ $//'`"
+ 
+ if test $enable_explicit_deps = yes; then
+   EXPLICIT_LIBS=" $LDLIBS" # the leading space is important here...
+diff --git a/itpp.pc.in b/itpp.pc.in
+index 4018865..48a9543 100644
+--- a/itpp.pc.in
++++ b/itpp.pc.in
+@@ -9,4 +9,4 @@ Version: @PACKAGE_VERSION@
+ URL: http://itpp.sourceforge.net/
+ Libs: -L${libdir} -l@PACKAGE@@EXPLICIT_LIBS@
+ Libs.private:@PRIVATE_LIBS@
+-Cflags: -I${includedir} @CXXFLAGS_OPT@
++Cflags: -I${includedir}
diff --git a/sci-libs/itpp/itpp-4.2-r1.ebuild b/sci-libs/itpp/itpp-4.2-r1.ebuild
index a58fb8ed140b..624efcf71397 100644
--- a/sci-libs/itpp/itpp-4.2-r1.ebuild
+++ b/sci-libs/itpp/itpp-4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/itpp/itpp-4.2-r1.ebuild,v 1.13 2012/07/15 10:39:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/itpp/itpp-4.2-r1.ebuild,v 1.14 2012/07/17 08:11:22 jlec Exp $
 
 EAPI=4
 
@@ -29,7 +29,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.0.7-fastica-fix-endless-loop.patch
 	"${FILESDIR}"/${P}-fastica-correct-dim.patch
 	"${FILESDIR}"/${P}-test-fftw.patch
-	"${FILESDIR}"/${P}-automake-1.12.patch
 	)
 
 src_prepare() {
diff --git a/sci-libs/itpp/itpp-4.2-r2.ebuild b/sci-libs/itpp/itpp-4.2-r2.ebuild
index 97b075e38d65..dba084af674e 100644
--- a/sci-libs/itpp/itpp-4.2-r2.ebuild
+++ b/sci-libs/itpp/itpp-4.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/itpp/itpp-4.2-r2.ebuild,v 1.1 2012/07/17 07:51:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/itpp/itpp-4.2-r2.ebuild,v 1.2 2012/07/17 08:11:22 jlec Exp $
 
 EAPI=4
 
@@ -30,6 +30,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.0.7-fastica-fix-endless-loop.patch
 	"${FILESDIR}"/${P}-fastica-correct-dim.patch
 	"${FILESDIR}"/${P}-test-fftw.patch
+	"${FILESDIR}"/${P}-automake-1.12.patch
+	"${FILESDIR}"/${P}-pkg-config.patch
 	)
 
 src_prepare() {