From 9e6109a61e08ef7a33410bf84e5054b0dae7078a Mon Sep 17 00:00:00 2001
From: Luca Longinotti <chtekk@gentoo.org>
Date: Fri, 1 Dec 2006 16:51:11 +0000
Subject: [PATCH] PHP herd takes over maintainership, fixup/cleanup ebuilds.
 Package-Manager: portage-2.1.2_rc2-r2

---
 dev-db/unixODBC/ChangeLog                 |  9 ++++-
 dev-db/unixODBC/metadata.xml              |  2 +-
 dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild | 45 +++++++++++------------
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/dev-db/unixODBC/ChangeLog b/dev-db/unixODBC/ChangeLog
index 46185ae9ede3..d40c7d37b58a 100644
--- a/dev-db/unixODBC/ChangeLog
+++ b/dev-db/unixODBC/ChangeLog
@@ -1,6 +1,13 @@
 # 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.59 2006/11/17 23:23:41 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.60 2006/12/01 16:51:11 chtekk Exp $
+
+  01 Dec 2006; Luca Longinotti <chtekk@gentoo.org>
+  -files/unixODBC-2.2.6-configure.in.patch, -files/gentoo-yac.diff,
+  metadata.xml, -unixODBC-2.0.8.ebuild, -unixODBC-2.2.2.ebuild,
+  -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:
+  PHP herd takes over maintainership, fixup/cleanup ebuilds.
 
   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,
diff --git a/dev-db/unixODBC/metadata.xml b/dev-db/unixODBC/metadata.xml
index 20ce219711a2..fd3dbe39fa64 100644
--- a/dev-db/unixODBC/metadata.xml
+++ b/dev-db/unixODBC/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+	<herd>php</herd>
 </pkgmetadata>
diff --git a/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild b/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild
index 6c1d0cdb0add..e737b526077f 100644
--- a/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild
@@ -1,32 +1,33 @@
 # 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.15 2006/11/17 23:23:41 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild,v 1.16 2006/12/01 16:51:11 chtekk Exp $
 
-inherit eutils
+inherit eutils multilib
 
-DESCRIPTION="ODBC Interface for Linux"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+
+DESCRIPTION="ODBC Interface for Linux."
 HOMEPAGE="http://www.unixodbc.org/"
 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"
 
-DEPEND="virtual/libc
-	>=sys-libs/readline-4.1
-	>=sys-libs/ncurses-5.2
-	qt3? ( =x11-libs/qt-3* )"
+DEPEND=">=sys-libs/readline-4.1
+		>=sys-libs/ncurses-5.2
+		qt3? ( =x11-libs/qt-3* )"
+RDEPEND="${DEPEND}"
 
 # the configure.in patch is required for 'use qt3'
 src_unpack() {
 	unpack ${P}.tar.gz
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${P}-flex.patch #110167
-	# braindead check in configure fails - hack approach
-	epatch "${FILESDIR}"/${P}-configure.in.patch
-	epatch "${FILESDIR}"/${P}-Makefile.am.patch
+	# solve bug #110167
+	epatch "${FILESDIR}/${P}-flex.patch"
+	# braindead check in configure fails - hackish approach
+	epatch "${FILESDIR}/${P}-configure.in.patch"
+	epatch "${FILESDIR}/${P}-Makefile.am.patch"
 	aclocal && \
 	libtoolize -c -f && \
 	automake && \
@@ -36,24 +37,22 @@ src_unpack() {
 src_compile() {
 	local myconf
 
-	if use qt3 && ! use mips;
-	then
-		myconf="--enable-gui=yes --x-libraries=/usr/lib "
+	if use qt3 && ! use mips ; then
+		myconf="--enable-gui=yes --x-libraries=/usr/lib"
 	else
 		myconf="--enable-gui=no"
 	fi
 
-	./configure --host=${CHOST} \
-		    --prefix=/usr \
-		    --sysconfdir=/etc/unixODBC \
-			--libdir=/usr/$(get_libdir) \
-		    ${myconf} || die
+	econf --prefix=/usr \
+		--sysconfdir=/etc/unixODBC \
+		--libdir=/usr/$(get_libdir) \
+		${myconf} || die "econf failed"
 
-	make || die
+	emake -j1 || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
 
 	dodoc AUTHORS ChangeLog NEWS README*
 	find doc/ -name "Makefile*" -exec rm '{}' \;
-- 
2.26.2