update postgres dependency to use virtual/postgresql-base (#306255)

Package-Manager: portage-2.1.7.16/cvs/Linux x86_64

4 files changed, 39 insertions, 5 deletions

diff --git a/net-misc/mico/ChangeLog b/net-misc/mico/ChangeLog
index d333993b611c..148e583dff64 100644
--- a/net-misc/mico/ChangeLog
+++ b/net-misc/mico/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/mico
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/ChangeLog,v 1.25 2010/02/24 08:53:26 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/ChangeLog,v 1.26 2010/02/24 10:05:29 haubi Exp $
+
+*mico-2.3.13-r3 (24 Feb 2010)
+
+  24 Feb 2010; Michael Haubenwallner <haubi@gentoo.org>
+  -mico-2.3.13-r2.ebuild, +mico-2.3.13-r3.ebuild,
+  +files/mico-2.3.13-drop-pgsql-header-check.patch:
+  update postgres dependency to use virtual/postgresql-base (#306255)
 
   24 Feb 2010; Michael Haubenwallner <haubi@gentoo.org>
   mico-2.3.13-r2.ebuild:
diff --git a/net-misc/mico/Manifest b/net-misc/mico/Manifest
index 6c8bd97c3e9f..8cd66880b582 100644
--- a/net-misc/mico/Manifest
+++ b/net-misc/mico/Manifest
@@ -1,6 +1,7 @@
 AUX gtk-config 87 RMD160 372fe81433c28726f71cf99986c9142f20605433 SHA1 973a86ac03cd251315e7b0a7a72d23603f1823c5 SHA256 95dc7514f6a305656ca9b973321e02a0376e9397ad6ad323f65d7601cfd7f015
 AUX mico-2.3.13-aix.patch 411 RMD160 a6f750d3e15e39b5b3e89645484bb631b6ec5eaa SHA1 ca97fbaf38ea738273c2f051decda928484b5bf4 SHA256 0823e1d621ba0e313ba00b675ffc650c2ebc83138b0ec21d5ab6b9dd3e5b9c9f
 AUX mico-2.3.13-as-needed.patch 553 RMD160 71e2e0fabcab2c2f9e705c66560e374427d95028 SHA1 19f2a8114c52bc53e01bc5f0bb6c2c0a07d018ef SHA256 3d7358e819dcb8a9ecc3291a53f76b710602aef30a58e7f44a38ae92144aacfe
+AUX mico-2.3.13-drop-pgsql-header-check.patch 965 RMD160 1e7c8457f024135b8df1a47f5cc46ca18594e91a SHA1 72349ebf8b8476fa4c043375ddf68cd1ba63b1a7 SHA256 74b878bcc0c915cfe1f62cbeb70c0cf70f7069a656894bd17c802aec087b6d63
 AUX mico-2.3.13-gcc43.patch 752 RMD160 767d448586b2ab8e773f8145ca77f23ea0cf317a SHA1 d6c1ef757d3cedad9b1fc2b5846a9ee16dc41538 SHA256 be64300153630158eab537dda057204159b482372b17b54ccc2177a7d884a535
 AUX mico-2.3.13-hpux.patch 689 RMD160 f112e97d1c1c579f9d5010a941584fbf3e247af3 SHA1 18fc7c5012a6a2e358647c2b37e6c73709146794 SHA256 6506bb60fa0514b7a6c232328720d32f0fce44cc53c389793bb4a133c339084c
 AUX mico-2.3.13-nolibcheck.patch 1124 RMD160 557c3588420938cef2365c86ff22a67c6c7594f9 SHA1 ac73d6113a2c0f65c4f6912a8a58e944a3d97d94 SHA256 bbc92cbfa298ac292d80f76859594430c0581af564df9fad7f5870d92fd3d333
@@ -8,6 +9,6 @@ AUX mico-2.3.13-pthread.patch 1317 RMD160 1ef269452add11a18e5c313c126029afb1a110
 AUX mico-2.3.13-qt4-nothread.patch 1017 RMD160 f959a969c2260ee0dff511f7ba4780ebedcb4419 SHA1 1a2a4f9677ba2477cd4f62215effb5a5935c721b SHA256 690efc138e8f65a7b39a44e43ba3d197f7b7c229a87caf62e1abef8682398fd2
 AUX mico-2.3.13-winnt.patch.bz2 7453 RMD160 6e89f88ab2fe7e13718e756e993d4aa1dfa73a50 SHA1 340d5a5ee2618e9bda9781e5112c2bf5463f0efe SHA256 5769f5deacbf8d7f29510cc719f895aaba7c21ef43c4ef6942ba7d8387b95ae5
 DIST mico-2.3.13.tar.gz 3269814 RMD160 70c8b9e68deac853ed2a28f48cd719bdef4e60fb SHA1 ee0138deb4d9ad0a50fe18e0b2add99fb5831c93 SHA256 a355fd0205440f0c8793b68d105b179942d883babc6b1fe69113707b88fe1d69
-EBUILD mico-2.3.13-r2.ebuild 4048 RMD160 31d10ceb62d3539e81e208d448ddb8b88ab80267 SHA1 b3a709b9dbfa4cb66f45649c8e97397b82ccb236 SHA256 503bea4c81c23f3c226a5fb51b2eb06842b9e77395708fe556019786eb7cc082
-MISC ChangeLog 2136 RMD160 dde50c9bfb81bdc42111c39ccfb525037080d793 SHA1 6b05cc75b277979a309180287a6fa558599f4686 SHA256 c295930292e81625cf8368e04c3bbef40875316aa2943381ada9917058755a14
+EBUILD mico-2.3.13-r3.ebuild 4111 RMD160 b5aa2d7ea6e54eb9dcd0fa3f91db6b4d6a43595e SHA1 c0bfcd5e4926adee54056ec70d59c293a68f9ffa SHA256 9b2e5ca9146b77a3a2d55d060b29a0fc2f9faeb95ab42626214456145b77c78c
+MISC ChangeLog 2396 RMD160 06808128ee1304295e41e1fd26993d09ff907173 SHA1 88557f1be2776da356e76798aca5bc090ce550c7 SHA256 0a67ad375fd49f298726953eb2443c0801f61fdd681c07c41c8c4d6936f091aa
 MISC metadata.xml 640 RMD160 7c861b35cb15bad094830b9e83d0077fb7177a4b SHA1 5426b40b5f7a464c4a4577bef86ab0fcd1be117f SHA256 1f8be72dd1c133d7a282c5e5564466680dff87ed0c5daf688b6dca00327d9f85
diff --git a/net-misc/mico/files/mico-2.3.13-drop-pgsql-header-check.patch b/net-misc/mico/files/mico-2.3.13-drop-pgsql-header-check.patch
new file mode 100644
index 000000000000..529c0ae7c741
--- /dev/null
+++ b/net-misc/mico/files/mico-2.3.13-drop-pgsql-header-check.patch
@@ -0,0 +1,25 @@
+http://bugs.gentoo.org/show_bug.cgi?id=306255
+
+Result of 'checking for pgsql/libpq-fe.h' is not used anywhere, just drop it.
+--- configure.in.orig	2010-02-24 10:27:45.043267799 +0100
++++ configure.in	2010-02-24 10:28:09.016074329 +0100
+@@ -1324,7 +1324,7 @@
+ AC_CHECK_HEADERS(netinet/tcp.h stdlib.h sys/time.h sunmath.h sys/stat.h)
+ AC_CHECK_HEADERS(poll.h)
+ 
+-AC_CHECK_HEADERS(exception exception.h terminate.h openssl/ssl.h pgsql/libpq-fe.h)
++AC_CHECK_HEADERS(exception exception.h terminate.h openssl/ssl.h)
+ 
+ # QT
+ AC_CHECK_HEADERS(qapplication.h qsocketnotifier.h qlineedit.h)
+--- configure.orig	2010-02-24 10:27:55.573241035 +0100
++++ configure	2010-02-24 10:28:19.102698424 +0100
+@@ -6906,7 +6906,7 @@
+ done
+ 
+ 
+-for ac_hdr in exception exception.h terminate.h openssl/ssl.h pgsql/libpq-fe.h
++for ac_hdr in exception exception.h terminate.h openssl/ssl.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
diff --git a/net-misc/mico/mico-2.3.13-r2.ebuild b/net-misc/mico/mico-2.3.13-r3.ebuild
index 2ff60e12464e..32ab33e98ef0 100644
--- a/net-misc/mico/mico-2.3.13-r2.ebuild
+++ b/net-misc/mico/mico-2.3.13-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/mico-2.3.13-r2.ebuild,v 1.2 2010/02/24 08:53:26 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/mico-2.3.13-r3.ebuild,v 1.1 2010/02/24 10:05:29 haubi Exp $
 
 EAPI="2"
 
@@ -21,7 +21,7 @@ RESTRICT="test" #298101
 
 RDEPEND="
 	gtk?       ( x11-libs/gtk+:2 )
-	postgres?  ( dev-db/postgresql )
+	postgres?  ( virtual/postgresql-base )
 	qt4?       ( x11-libs/qt-gui:4[qt3support] )
 	ssl?       ( dev-libs/openssl )
 	tcl?       ( dev-lang/tcl )
@@ -42,6 +42,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-hpux.patch
 	epatch "${FILESDIR}"/${P}-as-needed.patch #280678
 	epatch "${FILESDIR}"/${P}-qt4-nothread.patch
+	epatch "${FILESDIR}"/${P}-drop-pgsql-header-check.patch
 
 	[[ ${CHOST} == *-winnt* ]] && epatch "${FILESDIR}"/${P}-winnt.patch.bz2