Depend on dev-util/cvs if USE=gnome is set, see Bug 173256 for reasons

Package-Manager: portage-2.1.3.5

3 files changed, 33 insertions, 26 deletions

diff --git a/dev-db/unixODBC/ChangeLog b/dev-db/unixODBC/ChangeLog
index a4efa4e92fd6..fce7e994c981 100644
--- a/dev-db/unixODBC/ChangeLog
+++ b/dev-db/unixODBC/ChangeLog
@@ -1,6 +1,9 @@
 # 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.70 2007/07/01 12:57:27 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.71 2007/08/21 08:49:50 jokey Exp $
+
+  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
 
   01 Jul 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   unixODBC-2.2.12.ebuild:
diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index 2c0475db20e8..e12b066842af 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
@@ -17,14 +20,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 2481 RMD160 7fb60b16d66ff1418a9bb68a7e7addafda0a5905 SHA1 f30d36d92056e4b8ec575bb19afacb5739f0a8db SHA256 4c33435909a41020df6fe8779ea207f7e354a96f871cb7ac8369d92cc9118afb
-MD5 65d4181b8113842c072272190694b476 unixODBC-2.2.12.ebuild 2481
-RMD160 7fb60b16d66ff1418a9bb68a7e7addafda0a5905 unixODBC-2.2.12.ebuild 2481
-SHA256 4c33435909a41020df6fe8779ea207f7e354a96f871cb7ac8369d92cc9118afb unixODBC-2.2.12.ebuild 2481
-MISC ChangeLog 9631 RMD160 78696311ec194e9117a73ff15dd6930a5a645897 SHA1 44dfa9f8abcf78709adc9ec51cddbb562c076b17 SHA256 7dba802e1596e87872c5062862d27c2a6ee1267f609d838a58d165768b457c25
-MD5 9a9cc1bedf105d0f9cdb858e877bf01f ChangeLog 9631
-RMD160 78696311ec194e9117a73ff15dd6930a5a645897 ChangeLog 9631
-SHA256 7dba802e1596e87872c5062862d27c2a6ee1267f609d838a58d165768b457c25 ChangeLog 9631
+EBUILD unixODBC-2.2.12.ebuild 2140 RMD160 0693dfd04674dddccbc6dc527a980ea05c3bbfbd SHA1 17a56bf3253330452795ca4f183f4de2e6b58ecf SHA256 e7ec709effe104a9cd86e60b3fa9d8ba27afaa1b2ff6f9cc57c547ea1b2b0235
+MD5 d5ba7039c4b0e8f38a3417553d40ce63 unixODBC-2.2.12.ebuild 2140
+RMD160 0693dfd04674dddccbc6dc527a980ea05c3bbfbd unixODBC-2.2.12.ebuild 2140
+SHA256 e7ec709effe104a9cd86e60b3fa9d8ba27afaa1b2ff6f9cc57c547ea1b2b0235 unixODBC-2.2.12.ebuild 2140
+MISC ChangeLog 9773 RMD160 50679b9ac1133ea4e2fb22f7adc19198ff36489b SHA1 8d0f52e899e47a63e0fd8284d9ce7756d2064e6e SHA256 5df0a2263772dc27a92c5dd418932a17650f170e6cfd8f889691be0b91a00c33
+MD5 d2bda2fd6d3662de35f88248fb211fe4 ChangeLog 9773
+RMD160 50679b9ac1133ea4e2fb22f7adc19198ff36489b ChangeLog 9773
+SHA256 5df0a2263772dc27a92c5dd418932a17650f170e6cfd8f889691be0b91a00c33 ChangeLog 9773
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
@@ -35,3 +38,10 @@ SHA256 3c0ac4cc92bcebf20290bcb7d6da83165c2b55edcb5dc71c367b19b124829fa4 files/di
 MD5 aa7ce1ec186b5c706a1f85a8637e0f42 files/digest-unixODBC-2.2.12 527
 RMD160 fa0255ad32903f307e8658da171a240c7ba9b5aa files/digest-unixODBC-2.2.12 527
 SHA256 d7ac74c72be9e156cdc18603656f7d5bc39e1c958802db08b4fec82971d3d8e4 files/digest-unixODBC-2.2.12 527
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGyqc0z974XjDVpbkRAv2LAJ9T0srzg6lCv+JVHcnRt4M6TwzktACgjTdu
+vjffRFMxhfBoHuNTEwE15k4=
+=SeES
+-----END PGP SIGNATURE-----
diff --git a/dev-db/unixODBC/unixODBC-2.2.12.ebuild b/dev-db/unixODBC/unixODBC-2.2.12.ebuild
index fbac260f4a38..6881ed557e7d 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.9 2007/07/13 06:38:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.12.ebuild,v 1.10 2007/08/21 08:49:50 jokey Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -19,24 +19,19 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="qt3 gnome"
 
-DEPEND=">=sys-libs/readline-4.1
+RDEPEND=">=sys-libs/readline-4.1
 		>=sys-libs/ncurses-5.2
 		qt3? ( =x11-libs/qt-3* )
 		gnome? ( gnome-base/libgnomeui )"
-RDEPEND="${DEPEND}"
+
+DEPEND="${RDEPEND}
+	gnome? ( dev-util/cvs )" # see Bug 173256
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch ${WORKDIR}/${PATCH_P}/*
-	#epatch "${FILESDIR}/${P}-configure.in.patch"
-	#epatch "${FILESDIR}/${P}-qt.m4.patch"
-	#epatch "${FILESDIR}/${P}-gODBCConfig-Makefile.am.patch"
-	#epatch "${FILESDIR}/${P}-gODBCConfig-configure.in.patch"
-	#epatch "${FILESDIR}/${P}-gODBCConfig-odbcconfig.c.patch"
-	#epatch "${FILESDIR}/${P}-gODBCConfig-support.c.patch"
-	#epatch "${FILESDIR}/${P}-gODBCConfig-support.h.patch"
+	epatch "${WORKDIR}"/${PATCH_P}/*
 }
 
 src_compile() {
@@ -48,8 +43,7 @@ src_compile() {
 		myconf="--enable-gui=no"
 	fi
 
-# Detect mips systems properly
-	gnuconfig_update
+	# Detect mips systems properly
 	eautoreconf
 
 	econf --host=${CHOST} \
@@ -63,16 +57,16 @@ src_compile() {
 
 	if use gnome; then
 		# Symlink for configure
-		ln -s ${S}/odbcinst/.libs ./lib
+		ln -s "${S}"/odbcinst/.libs ./lib
 		# Symlink for libtool
-		ln -s ${S}/odbcinst/.libs ./lib/.libs
+		ln -s "${S}"/odbcinst/.libs ./lib/.libs
 
 		cd gODBCConfig
 		touch ChangeLog
 		gnuconfig_update
 		autoreconf --install
 		econf --host=${CHOST} \
-			--with-odbc=${S} \
+			--with-odbc="${S}" \
 			--enable-static \
 			--prefix=/usr \
 			--sysconfdir=/etc/${PN} || die "econf gODBCConfig failed"
@@ -90,7 +84,7 @@ src_install() {
 	if use gnome;
 	then
 		cd gODBCConfig
-		emake DESTDIR=${D} install || die "emake gODBCConfig install failed"
+		emake DESTDIR="${D}" install || die "emake gODBCConfig install failed"
 		cd ..
 	fi