Added tiny fix for compilation in freebsd, and ~x86-fbsd keyword.

Package-Manager: portage-2.1.1_pre5-r2

5 files changed, 39 insertions, 18 deletions

diff --git a/dev-python/psycopg/ChangeLog b/dev-python/psycopg/ChangeLog
index 89128e6e487c..e728a05406b2 100644
--- a/dev-python/psycopg/ChangeLog
+++ b/dev-python/psycopg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/psycopg
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/ChangeLog,v 1.46 2006/08/17 19:43:51 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/ChangeLog,v 1.47 2006/08/25 10:05:30 the_paya Exp $
+
+  25 Aug 2006; Javier Villavicencio <the_paya@gentoo.org>
+  +files/psycopg-2.0.4-fbsd.patch, psycopg-2.0.4.ebuild:
+  Added fix for compilation in freebsd, and ~x86-fbsd keyword.
 
   17 Aug 2006; Markus Rothe <corsair@gentoo.org> psycopg-1.1.21.ebuild:
   Stable on ppc64
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 61506ed7e604..b5556deaa175 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -6,7 +6,11 @@ AUX psycopg-2.0.4-debug.patch 586 RMD160 97c3e32dbfa253795054414913b986d0030aa62
 MD5 caad5a421edf9664278a721b1232c4b6 files/psycopg-2.0.4-debug.patch 586
 RMD160 97c3e32dbfa253795054414913b986d0030aa62a files/psycopg-2.0.4-debug.patch 586
 SHA256 41f456b7d594f835aa240d763d1b5aefe4facd077f611b0236ea1dadc244d549 files/psycopg-2.0.4-debug.patch 586
-DIST psycopg-1.1.18.tar.gz 60328 RMD160 46928a9fcf852bdd93aaa3fee87d943670d8fd48 SHA1 fe97d8e2a54d0323735a9178c886a7341fc08f19 SHA256 9f86402a2fa8dd295c18b1e8137d1debe0ce492cf7488b25b31af0672fa205af
+AUX psycopg-2.0.4-fbsd.patch 371 RMD160 952f3ebd7bf1ba7e8c4dfa8232fe36a2cd28d81a SHA1 46a69008770434c9ab78aacffcb9198bc50459be SHA256 cf450c38d3ad90f04d548f8247841bdffc6c3cc7085533311c0e760d4ef75196
+MD5 801fdf299c45a35d1a9a4c08c351737c files/psycopg-2.0.4-fbsd.patch 371
+RMD160 952f3ebd7bf1ba7e8c4dfa8232fe36a2cd28d81a files/psycopg-2.0.4-fbsd.patch 371
+SHA256 cf450c38d3ad90f04d548f8247841bdffc6c3cc7085533311c0e760d4ef75196 files/psycopg-2.0.4-fbsd.patch 371
+DIST psycopg-1.1.18.tar.gz 210061 RMD160 822cf1c590f298ace424d8ced4a8e7eb418c72d0 SHA1 fb0207623e578564d96eb00e109395a23bc3d2f6 SHA256 dd8d81674d2503a2ec5f0f898a2c8c287536838382c9f3141759d29cdb721a0f
 DIST psycopg-1.1.21.tar.gz 213753 RMD160 de74a70b16353f69de7e898059a7a1d8418ad2ee SHA1 02d8a8b5dd682306117896c7c63a9a1b518997b6 SHA256 f487d02e8e8837ec7e62e4e0f50bcb974e73b7765333b032ac50c07bf12ce240
 DIST psycopg2-2.0.2.tar.gz 279200 RMD160 8a56c952eda241ebc000bd9455c3482ee5890345 SHA1 94c37b6cfdc7fa40cf5c9b4e1b6d2b774f7b1ee2 SHA256 544f8ee7a84cd8312d688a15c16f92129bcc7139e1d814c3602a448d969f0454
 DIST psycopg2-2.0.4.tar.gz 279860 RMD160 ee4378ca2065edc2581555fbdf49880751e300e1 SHA1 29598a186d3a6afc542cd02537d2219af4d44386 SHA256 40b2dc7db6ca6ddf8393a6286fd06825179850eaa2a1aa3dd69d92dceac7eb6f
@@ -22,21 +26,21 @@ EBUILD psycopg-2.0.2.ebuild 858 RMD160 bbb8e9ee100b916d546be630783e4e33e2bfbad5
 MD5 504ff2623807ca59bdaa611578f1574c psycopg-2.0.2.ebuild 858
 RMD160 bbb8e9ee100b916d546be630783e4e33e2bfbad5 psycopg-2.0.2.ebuild 858
 SHA256 5159cd02a324b914303ee4810b844e200ea249637800a7e754197a8d31d56bf0 psycopg-2.0.2.ebuild 858
-EBUILD psycopg-2.0.4.ebuild 910 RMD160 21bb554307ebafc4635bab1a9f9d937cb89fc384 SHA1 6fe28fd5ef27f8aaec71a76729e560c94690c4e8 SHA256 f5a26dc5d4efe2f71f8551812ef7fd952bc09bc77dbf97955a9325c497af4777
-MD5 b5dfbf1284ef6a9b69c88f508b893039 psycopg-2.0.4.ebuild 910
-RMD160 21bb554307ebafc4635bab1a9f9d937cb89fc384 psycopg-2.0.4.ebuild 910
-SHA256 f5a26dc5d4efe2f71f8551812ef7fd952bc09bc77dbf97955a9325c497af4777 psycopg-2.0.4.ebuild 910
-MISC ChangeLog 6130 RMD160 0afb4617f7703354f8a1ac8ce4ae2f8be02df965 SHA1 3375b5f9834a7266dd25f0dc1e79338fff61d225 SHA256 9bae3a646c5b3a2fe61e64335beef4d792d3a4a2346113902d2bb2046685e70a
-MD5 ec826a449c8ec65ceffaa0821382d7e6 ChangeLog 6130
-RMD160 0afb4617f7703354f8a1ac8ce4ae2f8be02df965 ChangeLog 6130
-SHA256 9bae3a646c5b3a2fe61e64335beef4d792d3a4a2346113902d2bb2046685e70a ChangeLog 6130
+EBUILD psycopg-2.0.4.ebuild 995 RMD160 756a3003bfae37edf3919c76ed8f20df0c26f272 SHA1 40315a6627d2b921a43c0d4cb8d96e8c9a616599 SHA256 299d5eb2dfab4a2389fcc446b75f161e4683e3fca205514ba306bbcc0dedebd1
+MD5 a8a290143ce808e7c4227937edc0c0fe psycopg-2.0.4.ebuild 995
+RMD160 756a3003bfae37edf3919c76ed8f20df0c26f272 psycopg-2.0.4.ebuild 995
+SHA256 299d5eb2dfab4a2389fcc446b75f161e4683e3fca205514ba306bbcc0dedebd1 psycopg-2.0.4.ebuild 995
+MISC ChangeLog 6310 RMD160 ca47ae3ffe42168dfb8aebf0e10977fedd22e40b SHA1 6f234758ba9e749a700dc1de229c0effda2e076e SHA256 cdaecea27f26a80b6470fae4704a53f8c29637d81a5a55cc51cdf41c734ea71f
+MD5 c95eb9ef97cfc6b86a98a362c688b0de ChangeLog 6310
+RMD160 ca47ae3ffe42168dfb8aebf0e10977fedd22e40b ChangeLog 6310
+SHA256 cdaecea27f26a80b6470fae4704a53f8c29637d81a5a55cc51cdf41c734ea71f ChangeLog 6310
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 metadata.xml 159
-MD5 357340602a19b89e525f93fafe20dec1 files/digest-psycopg-1.1.18 241
-RMD160 b3bfcee6af845600b9db4f1a4cead5008bdcf2b8 files/digest-psycopg-1.1.18 241
-SHA256 2fe34558e8d5c8159d59d82b8518e22dbcf394dad60586435b70b3e3a07477e3 files/digest-psycopg-1.1.18 241
+MD5 85433016479d61db935cff841fcfe284 files/digest-psycopg-1.1.18 244
+RMD160 4753d1757ab58963e63fd8e326c3388086fbabcd files/digest-psycopg-1.1.18 244
+SHA256 dae69a3afb022ae9dfc33811001939e5f6a91943ba72ca155cd37d5a66f8d22e files/digest-psycopg-1.1.18 244
 MD5 f957a3f4ab6700f8c206335972ba7063 files/digest-psycopg-1.1.21 244
 RMD160 67b016bd5762b50bec90d94f41ed0eb5e5a83c0b files/digest-psycopg-1.1.21 244
 SHA256 2a44d334d590a32c22b5ee79c4f3fdaac1d84a726c2defb32b8efed93eb1df80 files/digest-psycopg-1.1.21 244
diff --git a/dev-python/psycopg/files/digest-psycopg-1.1.18 b/dev-python/psycopg/files/digest-psycopg-1.1.18
index d066c3fcb43b..374ff44ea95b 100644
--- a/dev-python/psycopg/files/digest-psycopg-1.1.18
+++ b/dev-python/psycopg/files/digest-psycopg-1.1.18
@@ -1,3 +1,3 @@
-MD5 e15aa883732f4152f2e078854951284c psycopg-1.1.18.tar.gz 60328
-RMD160 46928a9fcf852bdd93aaa3fee87d943670d8fd48 psycopg-1.1.18.tar.gz 60328
-SHA256 9f86402a2fa8dd295c18b1e8137d1debe0ce492cf7488b25b31af0672fa205af psycopg-1.1.18.tar.gz 60328
+MD5 8e5cd2925a25a5aa80cd83418d6a5f09 psycopg-1.1.18.tar.gz 210061
+RMD160 822cf1c590f298ace424d8ced4a8e7eb418c72d0 psycopg-1.1.18.tar.gz 210061
+SHA256 dd8d81674d2503a2ec5f0f898a2c8c287536838382c9f3141759d29cdb721a0f psycopg-1.1.18.tar.gz 210061
diff --git a/dev-python/psycopg/files/psycopg-2.0.4-fbsd.patch b/dev-python/psycopg/files/psycopg-2.0.4-fbsd.patch
new file mode 100644
index 000000000000..7faa6f36ffd1
--- /dev/null
+++ b/dev-python/psycopg/files/psycopg-2.0.4-fbsd.patch
@@ -0,0 +1,11 @@
+--- psycopg2-2.0.4/psycopg/config.h.orig	2006-02-11 15:56:19 -0300
++++ psycopg2-2.0.4/psycopg/config.h	2006-08-25 06:44:48 -0300
+@@ -102,7 +102,7 @@
+ #define inline
+ #endif
+ 
+-#if defined(__FreeBSD__) || defined(_WIN32) || defined(__sun__)
++#if defined(_WIN32) || defined(__sun__)
+ /* what's this, we have no round function either? */
+ static double round(double num)
+ {
diff --git a/dev-python/psycopg/psycopg-2.0.4.ebuild b/dev-python/psycopg/psycopg-2.0.4.ebuild
index ee8ce7c3efa4..8627f5f7f6d3 100644
--- a/dev-python/psycopg/psycopg-2.0.4.ebuild
+++ b/dev-python/psycopg/psycopg-2.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.0.4.ebuild,v 1.2 2006/08/10 21:20:18 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.0.4.ebuild,v 1.3 2006/08/25 10:05:30 the_paya Exp $
 
 inherit eutils distutils
 
@@ -14,7 +14,7 @@ DEPEND=">=dev-lang/python-2.4
 	>=dev-db/libpq-7.4"
 
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 LICENSE="GPL-2"
 IUSE="debug"
 
@@ -28,6 +28,8 @@ src_unpack() {
 	if use debug; then
 		epatch ${FILESDIR}/${P}-debug.patch
 	fi
+	# Fixes compilation issue in fbsd.
+	epatch "${FILESDIR}/${P}-fbsd.patch"
 }
 
 src_install() {