dropping gnome useflag for gnome-1.x removal

(Portage version: 2.1.2_rc1-r7)

6 files changed, 18 insertions, 157 deletions

diff --git a/dev-db/unixODBC/ChangeLog b/dev-db/unixODBC/ChangeLog
index 219f18634474..46185ae9ede3 100644
--- a/dev-db/unixODBC/ChangeLog
+++ b/dev-db/unixODBC/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/unixODBC
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.58 2006/10/09 18:33:11 malc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.59 2006/11/17 23:23:41 compnerd Exp $
+
+  17 Nov 2006; Saleem Abdulrasool <compnerd@gentoo.org> unixODBC-2.2.6.ebuild,
+  unixODBC-2.2.6-r1.ebuild, unixODBC-2.2.8.ebuild, unixODBC-2.2.11.ebuild,
+  unixODBC-2.2.11-r1.ebuild:
+  Dropping gnome useflag for gnome-1.x removal
 
   09 Oct 2006; <malc@gentoo.org> unixODBC-2.2.11-r1.ebuild:
   Fix multilib-strict QA checks - bug #149983
diff --git a/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild b/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild
index 26b1a1cc4993..6c1d0cdb0add 100644
--- a/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.2.11-r1.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-db/unixODBC/unixODBC-2.2.11-r1.ebuild,v 1.14 2006/10/09 18:33:11 malc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild,v 1.15 2006/11/17 23:23:41 compnerd Exp $
 
 inherit eutils
 
@@ -11,12 +11,11 @@ SRC_URI="http://www.unixodbc.org/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha ~amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="qt3 gnome"
+IUSE="qt3"
 
 DEPEND="virtual/libc
 	>=sys-libs/readline-4.1
 	>=sys-libs/ncurses-5.2
-	gnome? ( gnome-base/gnome-libs )
 	qt3? ( =x11-libs/qt-3* )"
 
 # the configure.in patch is required for 'use qt3'
@@ -51,40 +50,11 @@ src_compile() {
 		    ${myconf} || die
 
 	make || die
-
-	if use gnome;
-	then
-		# Symlink for configure
-		ln -s ${S}/odbcinst/.libs ./lib
-		# Symlink for libtool
-		ln -s ${S}/odbcinst/.libs ./lib/.libs
-		cd gODBCConfig
-		./configure --host=${CHOST} \
-				--with-odbc=${S} \
-				--prefix=/usr \
-				--x-libraries=/usr/lib \
-				--libdir=/usr/$(get_libdir) \
-				--sysconfdir=/etc/unixODBC \
-				${myconf} || die
-
-		# not sure why these symlinks are needed. busted configure, i guess...
-		ln -s ../depcomp .
-		ln -s ../libtool .
-		make || die
-		cd ..
-	fi
 }
 
 src_install() {
 	make DESTDIR=${D} install || die
 
-	if use gnome;
-	then
-		cd gODBCConfig
-		make DESTDIR=${D} install || die
-		cd ..
-	fi
-
 	dodoc AUTHORS ChangeLog NEWS README*
 	find doc/ -name "Makefile*" -exec rm '{}' \;
 	dohtml doc/*
diff --git a/dev-db/unixODBC/unixODBC-2.2.11.ebuild b/dev-db/unixODBC/unixODBC-2.2.11.ebuild
index 41877afce764..89b11986d4f8 100644
--- a/dev-db/unixODBC/unixODBC-2.2.11.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.2.11.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-db/unixODBC/unixODBC-2.2.11.ebuild,v 1.5 2006/06/24 15:08:38 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.11.ebuild,v 1.6 2006/11/17 23:23:41 compnerd Exp $
 
 inherit eutils gnuconfig
 
@@ -11,12 +11,11 @@ SRC_URI="http://www.unixodbc.org/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="qt3 gnome"
+IUSE="qt3"
 
 DEPEND="virtual/libc
 	>=sys-libs/readline-4.1
 	>=sys-libs/ncurses-5.2
-	gnome? ( gnome-base/gnome-libs )
 	qt3? ( =x11-libs/qt-3* )"
 
 # the configure.in patch is required for 'use qt3'
@@ -52,39 +51,11 @@ src_compile() {
 		    ${myconf} || die
 
 	make || die
-
-	if use gnome;
-	then
-		# Symlink for configure
-		ln -s ${S}/odbcinst/.libs ./lib
-		# Symlink for libtool
-		ln -s ${S}/odbcinst/.libs ./lib/.libs
-		cd gODBCConfig
-		./configure --host=${CHOST} \
-				--with-odbc=${S} \
-				--prefix=/usr \
-				--x-libraries=/usr/lib \
-				--sysconfdir=/etc/unixODBC \
-				${myconf} || die
-
-		# not sure why these symlinks are needed. busted configure, i guess...
-		ln -s ../depcomp .
-		ln -s ../libtool .
-		make || die
-		cd ..
-	fi
 }
 
 src_install() {
 	make DESTDIR=${D} install || die
 
-	if use gnome;
-	then
-		cd gODBCConfig
-		make DESTDIR=${D} install || die
-		cd ..
-	fi
-
 	dodoc AUTHORS ChangeLog NEWS README*
 	find doc/ -name "Makefile*" -exec rm '{}' \;
 	dohtml doc/*
diff --git a/dev-db/unixODBC/unixODBC-2.2.6-r1.ebuild b/dev-db/unixODBC/unixODBC-2.2.6-r1.ebuild
index 7336d7cc1cf3..85daa3a6f643 100644
--- a/dev-db/unixODBC/unixODBC-2.2.6-r1.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.2.6-r1.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-db/unixODBC/unixODBC-2.2.6-r1.ebuild,v 1.13 2006/06/24 15:08:38 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.6-r1.ebuild,v 1.14 2006/11/17 23:23:41 compnerd Exp $
 
 inherit eutils
 
@@ -11,12 +11,11 @@ SRC_URI="http://www.unixodbc.org/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~hppa ~alpha ~amd64 ~sparc"
-IUSE="qt3 gnome"
+IUSE="qt3"
 
 DEPEND="virtual/libc
 	>=sys-libs/readline-4.1
 	>=sys-libs/ncurses-5.2
-	gnome? ( gnome-base/gnome-libs )
 	qt3? ( =x11-libs/qt-3* )"
 
 # the configure.in patch is required for 'use qt3'
@@ -46,35 +45,11 @@ src_compile() {
 		${myconf} || die
 
 	make || die
-
-	if use gnome
-	then
-		cd gODBCConfig
-		./configure \
-			--host=${CHOST} \
-			--prefix=/usr \
-			--sysconfdir=/etc/unixODBC \
-			--x-libraries=/usr/lib \
-			${myconf} || die
-
-		# not sure why these symlinks are needed. busted configure, i guess...
-		ln -s ../depcomp .
-		ln -s ../libtool .
-		make || die
-		cd ..
-	fi
 }
 
 src_install() {
 	make DESTDIR=${D} install || die
 
-	if use gnome
-	then
-		cd gODBCConfig
-		make DESTDIR=${D} install || die
-		cd ..
-	fi
-
 	dodoc AUTHORS ChangeLog NEWS README*
 	find doc/ -name "Makefile*" -exec rm '{}' \;
 	dohtml doc/*
diff --git a/dev-db/unixODBC/unixODBC-2.2.6.ebuild b/dev-db/unixODBC/unixODBC-2.2.6.ebuild
index 08febb0fb03c..2d34a7d92026 100644
--- a/dev-db/unixODBC/unixODBC-2.2.6.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.2.6.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-db/unixODBC/unixODBC-2.2.6.ebuild,v 1.19 2006/06/24 15:08:38 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.6.ebuild,v 1.20 2006/11/17 23:23:41 compnerd Exp $
 
 DESCRIPTION="ODBC Interface for Linux"
 HOMEPAGE="http://www.unixodbc.org/"
@@ -9,13 +9,12 @@ SRC_URI="http://www.unixodbc.org/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc hppa alpha amd64 sparc ia64"
-IUSE="qt3 gnome"
+IUSE="qt3"
 
 DEPEND="virtual/libc
 	>=sys-libs/readline-4.1
 	>=sys-libs/ncurses-5.2
-	qt3? ( =x11-libs/qt-3* )
-	gnome? ( gnome-base/gnome-libs )"
+	qt3? ( =x11-libs/qt-3* )"
 
 src_compile() {
 	local myconf
@@ -33,39 +32,11 @@ src_compile() {
 		    ${myconf} || die
 
 	make || die
-
-	if use gnome
-	then
-		# Symlink for configure
-		ln -s ${S}/odbcinst/.libs ./lib
-		# Symlink for libtool
-		ln -s ${S}/odbcinst/.libs ./lib/.libs
-		cd gODBCConfig
-		./configure --host=${CHOST} \
-				--with-odbc=${S} \
-				--prefix=/usr \
-				--x-libraries=/usr/lib \
-				--sysconfdir=/etc/unixODBC \
-				|| die
-
-		# not sure why these symlinks are needed. busted configure, i guess...
-		ln -s ../depcomp .
-		ln -s ../libtool .
-		make || die
-		cd ..
-	fi
 }
 
 src_install() {
 	make DESTDIR=${D} install || die
 
-	if use gnome
-	then
-		cd gODBCConfig
-		make DESTDIR=${D} install || die
-		cd ..
-	fi
-
 	dodoc AUTHORS COPYING ChangeLog NEWS README*
 	find doc/ -name "Makefile*" -exec rm '{}' \;
 	dohtml doc/*
diff --git a/dev-db/unixODBC/unixODBC-2.2.8.ebuild b/dev-db/unixODBC/unixODBC-2.2.8.ebuild
index 431e1c5b94ea..b1b84583861f 100644
--- a/dev-db/unixODBC/unixODBC-2.2.8.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.2.8.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-db/unixODBC/unixODBC-2.2.8.ebuild,v 1.22 2006/06/24 15:08:38 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.8.ebuild,v 1.23 2006/11/17 23:23:41 compnerd Exp $
 
 inherit eutils gnuconfig multilib
 
@@ -11,15 +11,12 @@ SRC_URI="http://www.unixodbc.org/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ppc ~sparc mips ~alpha arm hppa ~amd64 s390 ppc64"
-IUSE="qt3 gnome"
+IUSE="qt3"
 
 DEPEND="virtual/libc
 	>=sys-libs/readline-4.1
 	>=sys-libs/ncurses-5.2
-	!mips? (
-		gnome? ( gnome-base/gnome-libs )
-		qt3? ( =x11-libs/qt-3* )
-	)"
+	!mips? ( qt3? ( =x11-libs/qt-3* ) )"
 
 # the configure.in patch is required for 'use qt3'
 src_unpack() {
@@ -55,39 +52,11 @@ src_compile() {
 		    ${myconf} || die
 
 	make || die
-
-	if use gnome
-	then
-		# Symlink for configure
-		ln -s ${S}/odbcinst/.libs ./lib
-		# Symlink for libtool
-		ln -s ${S}/odbcinst/.libs ./lib/.libs
-		cd gODBCConfig
-		./configure --host=${CHOST} \
-				--with-odbc=${S} \
-				--prefix=/usr \
-				--x-libraries=/usr/$(get_libdir) \
-				--sysconfdir=/etc/unixODBC \
-				${myconf} || die
-
-		# not sure why these symlinks are needed. busted configure, i guess...
-		ln -s ../depcomp .
-		ln -s ../libtool .
-		make || die
-		cd ..
-	fi
 }
 
 src_install() {
 	make DESTDIR=${D} install || die
 
-	if use gnome
-	then
-		cd gODBCConfig
-		make DESTDIR=${D} install || die
-		cd ..
-	fi
-
 	dodoc AUTHORS ChangeLog NEWS README*
 	find doc/ -name "Makefile*" -exec rm '{}' \;
 	dohtml doc/*