Port --as-needed fix from project overlay

Package-Manager: portage-2.1.3.7

4 files changed, 42 insertions, 13 deletions

diff --git a/dev-db/unixODBC/ChangeLog b/dev-db/unixODBC/ChangeLog
index fce7e994c981..f02e5b383ed8 100644
--- a/dev-db/unixODBC/ChangeLog
+++ b/dev-db/unixODBC/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-db/unixODBC
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.71 2007/08/21 08:49:50 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.72 2007/09/01 15:51:47 jokey Exp $
+
+  01 Sep 2007; Markus Ullmann <jokey@gentoo.org>
+  +files/350-unixODBC-2.2.12-gODBCConfig-as-needed.patch,
+  unixODBC-2.2.12.ebuild:
+  Port --as-needed fix from project overlay
+
+  01 Sep 2007; Jakub Moc <jakub@gentoo.org>
+  +files/350-unixODBC-2.2.12-gODBCConfig-as-needed.patch,
+  unixODBC-2.2.12.ebuild:
+  Fix compile with --as-needed and USE=gnome, Bug 173048
 
   21 Aug 2007; Markus Ullmann <jokey@gentoo.org> unixODBC-2.2.12.ebuild:
   Depend on dev-util/cvs if USE=gnome is set, see Bug 173256 for reasons
diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index 9d480e30c100..9b2a3f87bd52 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 350-unixODBC-2.2.12-gODBCConfig-as-needed.patch 382 RMD160 080c2947d564ed320071ebd7750cda50886084d6 SHA1 11f482aeeea33fc196b45ba35120755ac88c2978 SHA256 460bbf2dd174d0286b89330d991c3f7030ca7256bce8b16ebf4593572cf7be85
+MD5 9c741c77e7f723fa890e182facd2a84c files/350-unixODBC-2.2.12-gODBCConfig-as-needed.patch 382
+RMD160 080c2947d564ed320071ebd7750cda50886084d6 files/350-unixODBC-2.2.12-gODBCConfig-as-needed.patch 382
+SHA256 460bbf2dd174d0286b89330d991c3f7030ca7256bce8b16ebf4593572cf7be85 files/350-unixODBC-2.2.12-gODBCConfig-as-needed.patch 382
 AUX unixODBC-2.2.11-Makefile.am.patch 1295 RMD160 4ff252fc9aaa9177770e7493e0e71466e53d3b37 SHA1 2b0953ffb879b8dfc98beab0a01eceeaaa01112b SHA256 669c3f0897fad09cb7dd750319605a34221eaeac633501550ca791a83e7e64c5
 MD5 9e8b6228770e807090916883a6903351 files/unixODBC-2.2.11-Makefile.am.patch 1295
 RMD160 4ff252fc9aaa9177770e7493e0e71466e53d3b37 files/unixODBC-2.2.11-Makefile.am.patch 1295
@@ -20,14 +24,14 @@ EBUILD unixODBC-2.2.11-r1.ebuild 1489 RMD160 8cec400757556fbda563c4bc59e1e0db221
 MD5 5e1f7c19d1dacefec8d901e0d3d07bcd unixODBC-2.2.11-r1.ebuild 1489
 RMD160 8cec400757556fbda563c4bc59e1e0db22137e79 unixODBC-2.2.11-r1.ebuild 1489
 SHA256 c66704ce78ce66c99492e8a3106c4b6d853d2f7cdc6bc82a21c3990ff5a4164e unixODBC-2.2.11-r1.ebuild 1489
-EBUILD unixODBC-2.2.12.ebuild 2138 RMD160 41a09002d33d093d1d4c83792d425b1d370e2e8f SHA1 5c86748eff5cffcc2d0a4dcdf00e9bd200df64da SHA256 5da401df17cac70cf061cc50bdb22c97b1a987ff814bc492ab66914ab88c5044
-MD5 3c31a96e4113208b0a97faa4724ba100 unixODBC-2.2.12.ebuild 2138
-RMD160 41a09002d33d093d1d4c83792d425b1d370e2e8f unixODBC-2.2.12.ebuild 2138
-SHA256 5da401df17cac70cf061cc50bdb22c97b1a987ff814bc492ab66914ab88c5044 unixODBC-2.2.12.ebuild 2138
-MISC ChangeLog 9773 RMD160 50679b9ac1133ea4e2fb22f7adc19198ff36489b SHA1 8d0f52e899e47a63e0fd8284d9ce7756d2064e6e SHA256 5df0a2263772dc27a92c5dd418932a17650f170e6cfd8f889691be0b91a00c33
-MD5 d2bda2fd6d3662de35f88248fb211fe4 ChangeLog 9773
-RMD160 50679b9ac1133ea4e2fb22f7adc19198ff36489b ChangeLog 9773
-SHA256 5df0a2263772dc27a92c5dd418932a17650f170e6cfd8f889691be0b91a00c33 ChangeLog 9773
+EBUILD unixODBC-2.2.12.ebuild 2196 RMD160 be5a9338b861daa77f2d0ee4b886320b2c77bba4 SHA1 f4d2aa34cbf310a2820a30089ed68f56b7f0de73 SHA256 0e44be7fa770ace8e163edfb4a9683c7229b45274fbb77ba5c0f11eacf36e6d3
+MD5 5513d25664f9f0e11ee0980d473d6955 unixODBC-2.2.12.ebuild 2196
+RMD160 be5a9338b861daa77f2d0ee4b886320b2c77bba4 unixODBC-2.2.12.ebuild 2196
+SHA256 0e44be7fa770ace8e163edfb4a9683c7229b45274fbb77ba5c0f11eacf36e6d3 unixODBC-2.2.12.ebuild 2196
+MISC ChangeLog 10137 RMD160 eb6fb27617a1641564e42893b4b2ef154c14eea9 SHA1 5f5abe79238e061f475a58ebaeea9c746e35941f SHA256 c290d7d4f2a5e23d5566d4344cd7e414faf47dbc99a0774f573169d7bf4f8b3a
+MD5 0f733de0bb9c71d1d815eade69155af6 ChangeLog 10137
+RMD160 eb6fb27617a1641564e42893b4b2ef154c14eea9 ChangeLog 10137
+SHA256 c290d7d4f2a5e23d5566d4344cd7e414faf47dbc99a0774f573169d7bf4f8b3a ChangeLog 10137
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
@@ -41,7 +45,7 @@ SHA256 d7ac74c72be9e156cdc18603656f7d5bc39e1c958802db08b4fec82971d3d8e4 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFG0K8ap/wUKkr7RBoRAiuqAKCHiI9HzlHEUeIwSjKz9AOIjHy5LwCeIUMO
-JvFqlpfL1ovcNawjDbgXWHI=
-=17OI
+iD8DBQFG2Ypnz974XjDVpbkRAvy3AKC38Y3vr8C9QRuR6c7kzNNdCD4hyQCfac3m
+vVQtLyJ5HABDd3wcnBxwl6M=
+=WsvF
 -----END PGP SIGNATURE-----
diff --git a/dev-db/unixODBC/files/350-unixODBC-2.2.12-gODBCConfig-as-needed.patch b/dev-db/unixODBC/files/350-unixODBC-2.2.12-gODBCConfig-as-needed.patch
new file mode 100644
index 000000000000..566ad68aceb0
--- /dev/null
+++ b/dev-db/unixODBC/files/350-unixODBC-2.2.12-gODBCConfig-as-needed.patch
@@ -0,0 +1,14 @@
+-- gODBCConfig/src/Makefile.am.orig	2005-09-17 15:08:16.000000000 +0200
++++ gODBCConfig/src/Makefile.am	2007-08-27 18:29:22.000000000 +0200
+@@ -22,6 +22,10 @@
+ 	interface.h \
+ 	callbacks.c callbacks.h
+ 
++
++libgtkodbcconfig_la_LIBADD = ../../odbcinst/libodbcinst.la 
++
++
+ gODBCConfig_DEPENDENCIES = libgtkodbcconfig.la ../../ini/libinilc.la
+ 
+ gODBCConfig_LDADD = $(GNOME_LIBDIR) \
+
diff --git a/dev-db/unixODBC/unixODBC-2.2.12.ebuild b/dev-db/unixODBC/unixODBC-2.2.12.ebuild
index 842f1846c4da..acf02b14ee58 100644
--- a/dev-db/unixODBC/unixODBC-2.2.12.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.2.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.12.ebuild,v 1.11 2007/08/25 22:35:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.12.ebuild,v 1.12 2007/09/01 15:51:47 jokey Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -32,6 +32,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${WORKDIR}"/${PATCH_P}/*
+	epatch "${FILESDIR}"/350-${P}-gODBCConfig-as-needed.patch
 }
 
 src_compile() {