Relax libpqxx version dependency since it seems to work fine with 4.0, bug 414277

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

6 files changed, 33 insertions, 27 deletions

diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog
index 0f52bda617a7..4d72aa5d70eb 100644
--- a/app-office/calligra/ChangeLog
+++ b/app-office/calligra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/calligra
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.39 2012/04/26 22:35:26 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.40 2012/05/02 21:59:18 dilfridge Exp $
+
+  02 May 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  calligra-2.4.0-r1.ebuild, calligra-2.4.1.ebuild, calligra-2.4.9999.ebuild,
+  calligra-9999.ebuild:
+  Relax libpqxx version dependency since it seems to work fine with 4.0, bug
+  414277
 
 *calligra-2.4.1 (26 Apr 2012)
 
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index d66f030be74f..44955b25bacb 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -4,26 +4,26 @@ Hash: SHA512
 AUX calligra-2.4.0-rdf.patch 7537 RMD160 4320fe29ab85791232665a7f2d717dab1b8505b3 SHA1 048f59b24ef7662363423b3d71483c979bd3e050 SHA256 0a2d29cc549d032b70c8d006d5db56d857b4db1946795f94dcfe52f52e5d49c9
 DIST calligra-2.4.0.tar.bz2 123325347 RMD160 840efd6c7ff82b246950de591b9af762d37f9a95 SHA1 6026f4ddcf4bf647ea13dfb477233df472a5c007 SHA256 7c8cd1ec8cd2b26d5544f3b5a283052c5cd82f212749475b91cc340f7e4029b0
 DIST calligra-2.4.1.tar.bz2 119301573 RMD160 5cb241ab46c6e064a05e39436da81f2a2a8df71f SHA1 f5be221d50088ac4537931811272392846cd7363 SHA256 59a5421484ec71bfc3db6351d44a88b22dd164a5ff8cd225b67ac2eb835774a3
-EBUILD calligra-2.4.0-r1.ebuild 6024 RMD160 4b7e469dc076a5dba162162b240e37c2b9b9414f SHA1 33038ab238e95bda1682123eed7e96b3422c59cd SHA256 ca076674c67d1ebd0133418a32ccb8281db0780e7c55d50fa3a05d51fd626823
-EBUILD calligra-2.4.1.ebuild 5978 RMD160 d1e33cf23f63b5057305cd06df0e9ab74522858e SHA1 19d7150a75cc12375a6c57b1441d7e3a8c1a1364 SHA256 975fc70df6b91bd71deea4d727bdce68a14acbb3c3b58b7560b18afbf0d206db
-EBUILD calligra-2.4.9999.ebuild 6024 RMD160 7f8c1c4c160266dc59fb6ab9533dd4b79ca5f8e5 SHA1 ac599ed9e1f4cd1cf373b62ee066eac4ed9a3e97 SHA256 25086f22743059b98c95bc4fd9f29cffb46cd4e5d66e7d8768ddc0f4f32349f0
-EBUILD calligra-9999.ebuild 5853 RMD160 36ee0b1999274499712d890d11c1b52a28f88a52 SHA1 aa5fb18286b4b941332fc424b6a4e788629950a1 SHA256 3493923da496efa04c54407480c3b81996b5d7899901778aa61ee57347a88c0f
-MISC ChangeLog 7016 RMD160 31b24beb73f2f6de25e970da79882646b7e70746 SHA1 a33fe2b67bfe20a21299a1de69f6e264f6828bca SHA256 eec51823403aef93126882678d3664643f60d4011fead360118bd9c95fc611a3
+EBUILD calligra-2.4.0-r1.ebuild 6026 RMD160 6e592e39b70506b82123f2954929cb803b6b68f5 SHA1 f6661ac3f762056c55442a140947371c6ac5c08d SHA256 73b3f88a23c176318e7774b7ece8a684e7f1e915d695c5988bd4a9048dd397fb
+EBUILD calligra-2.4.1.ebuild 5974 RMD160 be9253d0c26c6a8435b73bce20309a8630975e89 SHA1 c36b942484380902044cdf2d9a977d23e327a620 SHA256 0794319e0cd9a1228f5c2a447247239f0b87cd8e1eed5e503919db819e74779a
+EBUILD calligra-2.4.9999.ebuild 6026 RMD160 e45a529f9ddd970b348ec9b1cffd1d2b35906438 SHA1 6121c85477c26265e22c0e528c008013c46b1000 SHA256 61b8acf40a6a0c63dfcc9600bc4bb09d02f3bed4119526b17ddd9f54e543027b
+EBUILD calligra-9999.ebuild 5849 RMD160 d0cb79e5ac354186c8402b582f734e7b798a41be SHA1 6071fc8a10c68303da69a9f83d8a42f42672819d SHA256 442f6a0222871fc469418bb8f8259eb02c0b8b5b906fe24807f96259128ac17c
+MISC ChangeLog 7261 RMD160 bbc22582c1736425e45bd3efe00a6f29de9d4c73 SHA1 4f5156958340e928e84cc3806ff54496e8eba1b6 SHA256 abebdd08020c87074a3fdb55e7bf86413d3cd31b52a88502a8d109aa57ba3d9f
 MISC metadata.xml 1491 RMD160 f8ff74f843ae8df2be457f5376f8d1ad08604c09 SHA1 56f2b25dfd6524b43aed66a177a515e80f04cde2 SHA256 9e6668563b25b690da423ea91dbac27e6289ee117cb6cb026c2657c476555c69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPmc3GAAoJENwGBM22xffeb7oP/ipJOrFHwMrJBVh/+/vFpsKR
-RyB2hKoEUMGEOSOaI1dt/WnNiUaTVZVNlqnvSaRCZ8e6tIwgdT/UQmwYNf/6nrfV
-42LrSPfugl1T4UnxHIscDUS4i0J8RPZRfGvFgUiIIA12Vl3Ypk9Wt8XTrTzO8rk6
-+JX0oxC2hnSH6uqfm9xMd59i2iHEWkK7iowqPOGD35um+oIk32hYvX8KtAILnK4s
-vbADZ0N6UYYspcAHI4N+s200AI6CZAq0imQN48N1xmb2mJ0E2+QlDEs92UduHwta
-sIhUfYnvUAVNDbOdqOKvKsYHZoNez2wl43Rv5yJM0l94os8lqZc1Gk1TZUaUDLvj
-qzsKDjbbciLhk+9iCQElbMevjC3Yqz4F3GlxFbOIpFv9+TDGll8BTVM9olXK72Q6
-WIrEkCIul6rTCT7IUqN3a13FSKm7kWHCYV17sDYzFv9iViZ/o68bmYmmrVxAzs2x
-GwDMtSsDpIpI7aoG0IHtuMsKOiIEckcUvuGZe/mbybVqsz9rAy9UNvf6knxRsmVW
-WfTOWGTfCBdo7oeQc4dpfO1/zwEKnQTO92ZQDyRcLcPPGWD37BtBSQPgtXhCl1kX
-+GQHnhdza2bX9UtuW+4t3a7ij2QfNKvH/co/b12MgBoWMjf/YfFizGd/CPmkxJEP
-yysDChZFSfT8v7Ynbz9D
-=fbz1
+iQIcBAEBCgAGBQJPoa5PAAoJENwGBM22xffeZ1wP/RmP3t91lTA5sUS8jMC5FUt+
+OdKf/s0jkUyD4pu8lyGxVhoNY9ARLGpkOZFNS5KqeN9dI2F4a6m6BcKxowO76eKj
+eY8u1g8CPsH5+WWflk4b9goYxK9M1PnWVzuFuG8R2V7jx6SwsLPpGC66CESdnZXz
+nLbzxv34/DrMl9REwHrhrYa5gia0xbudwbMqj8G35tRWLXj3U9mHJyelR55FHAVN
+ylP6eUZ6+I9T+Qcpp38L/jvaGkKv2frD03qkJDIb61C5QG+RxhGe8M0fGB3Iihyr
+kiSGpa80Fcw6UA1vd8OU6K/BTtxYJs9QmH/SKwuj5DwiIlAxhdRQurUsITQujlsu
+mmgLYdGJw6wiBZ2cd7MPpcqFvnz9EzSruovKl+tJpfSlzDLqT6GgQwCkF0z/cYjD
+evd5xv5h2d/OvR4+97Tl2AAPVm8e371nfOL247O+7gTo9v+dHjuIfAXhs2/qApXl
+L1s0JkJglvAwKURW1YBPmoJBPCkia/JQGxiq+otQWmVZ2SbhBSwd6LHBHsfXhnaV
+Eu7H/wh2UWQXXso77k6iYgdyP8+qEZMENRjRvbj7eGZx7DGv7wpZqEwAlOv4viE6
+0p+Uxqp2y3hTLvFLna2vhQ2qv1KM4/vGdaQwre31xe7mC/DmcUWJTKFgL7T5MxNU
+iOdLvdB/M/oF9uGvr951
+=roTe
 -----END PGP SIGNATURE-----
diff --git a/app-office/calligra/calligra-2.4.0-r1.ebuild b/app-office/calligra/calligra-2.4.0-r1.ebuild
index 97c6ea38350d..3a29866a14dc 100644
--- a/app-office/calligra/calligra-2.4.0-r1.ebuild
+++ b/app-office/calligra/calligra-2.4.0-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/app-office/calligra/calligra-2.4.0-r1.ebuild,v 1.4 2012/04/13 17:50:47 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.0-r1.ebuild,v 1.5 2012/05/02 21:59:18 dilfridge Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -96,7 +96,7 @@ RDEPEND="
 	)
 	postgres? (
 		dev-db/postgresql-base
-		=dev-libs/libpqxx-3*
+		dev-libs/libpqxx
 	)
 	semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs semantic-desktop) )
 	ssl? ( dev-libs/openssl )
diff --git a/app-office/calligra/calligra-2.4.1.ebuild b/app-office/calligra/calligra-2.4.1.ebuild
index acdfa3a49564..dfb0a802f974 100644
--- a/app-office/calligra/calligra-2.4.1.ebuild
+++ b/app-office/calligra/calligra-2.4.1.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/app-office/calligra/calligra-2.4.1.ebuild,v 1.1 2012/04/26 22:35:26 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.1.ebuild,v 1.2 2012/05/02 21:59:18 dilfridge Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -96,7 +96,7 @@ RDEPEND="
 	)
 	postgres? (
 		dev-db/postgresql-base
-		=dev-libs/libpqxx-3*
+		dev-libs/libpqxx
 	)
 	semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs semantic-desktop) )
 	ssl? ( dev-libs/openssl )
diff --git a/app-office/calligra/calligra-2.4.9999.ebuild b/app-office/calligra/calligra-2.4.9999.ebuild
index 7cf0cb2dafdb..6753f66aeec8 100644
--- a/app-office/calligra/calligra-2.4.9999.ebuild
+++ b/app-office/calligra/calligra-2.4.9999.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/app-office/calligra/calligra-2.4.9999.ebuild,v 1.7 2012/04/13 17:50:47 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.9999.ebuild,v 1.8 2012/05/02 21:59:18 dilfridge Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -96,7 +96,7 @@ RDEPEND="
 	)
 	postgres? (
 		dev-db/postgresql-base
-		=dev-libs/libpqxx-3*
+		dev-libs/libpqxx
 	)
 	semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs semantic-desktop) )
 	ssl? ( dev-libs/openssl )
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index b737d53d6076..5b3aefa73230 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.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/app-office/calligra/calligra-9999.ebuild,v 1.17 2012/04/12 20:16:22 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.18 2012/05/02 21:59:18 dilfridge Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -94,7 +94,7 @@ RDEPEND="
 	)
 	postgres? (
 		dev-db/postgresql-base
-		=dev-libs/libpqxx-3*
+		dev-libs/libpqxx
 	)
 	semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs semantic-desktop) )
 	ssl? ( dev-libs/openssl )