From 582baa90bef7e9b8525fc5a66f9a1c31df32b2c0 Mon Sep 17 00:00:00 2001
From: Michael Imhof <tantive@gentoo.org>
Date: Sun, 1 Feb 2004 12:29:25 +0000
Subject: Fixed my errors. Closes #40045.

---
 dev-db/libiodbc/Manifest                        |  6 ++---
 dev-db/libiodbc/files/digest-libiodbc-3.51.1    |  1 -
 dev-db/libiodbc/files/digest-libiodbc-3.51.1-r1 |  1 +
 dev-db/libiodbc/libiodbc-3.51.1-r1.ebuild       | 29 +++++++++++++++++++++++++
 dev-db/libiodbc/libiodbc-3.51.1.ebuild          | 20 -----------------
 5 files changed, 32 insertions(+), 25 deletions(-)
 delete mode 100644 dev-db/libiodbc/files/digest-libiodbc-3.51.1
 create mode 100644 dev-db/libiodbc/files/digest-libiodbc-3.51.1-r1
 create mode 100644 dev-db/libiodbc/libiodbc-3.51.1-r1.ebuild
 delete mode 100644 dev-db/libiodbc/libiodbc-3.51.1.ebuild

(limited to 'dev-db')

diff --git a/dev-db/libiodbc/Manifest b/dev-db/libiodbc/Manifest
index 1ff6e88d4a5c..0fc3bc08563f 100644
--- a/dev-db/libiodbc/Manifest
+++ b/dev-db/libiodbc/Manifest
@@ -1,5 +1,3 @@
-MD5 105426fee138d5e8fcc326c7daaf9d2b libiodbc-3.51.1.ebuild 844
-MD5 bd94e992924ef776d723e192600266e4 libiodbc-3.51.1-r1.ebuild 1125
-MD5 8237cf87775ebd3ebc43b38d2bf60fe2 ChangeLog 339
-MD5 bf083fadf4e1d7d36a3d0711631089b4 files/digest-libiodbc-3.51.1 67
+MD5 c8a4755991f367d8ad2a49a94b1cfe36 libiodbc-3.51.1-r1.ebuild 1128
+MD5 594c9de40bf7077acde6ee448f5b5548 ChangeLog 512
 MD5 bf083fadf4e1d7d36a3d0711631089b4 files/digest-libiodbc-3.51.1-r1 67
diff --git a/dev-db/libiodbc/files/digest-libiodbc-3.51.1 b/dev-db/libiodbc/files/digest-libiodbc-3.51.1
deleted file mode 100644
index 6f0390ca8fe2..000000000000
--- a/dev-db/libiodbc/files/digest-libiodbc-3.51.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c63b6f3d7bc459bdf791517c84402160 libiodbc-3.51.1.tar.gz 540563
diff --git a/dev-db/libiodbc/files/digest-libiodbc-3.51.1-r1 b/dev-db/libiodbc/files/digest-libiodbc-3.51.1-r1
new file mode 100644
index 000000000000..6f0390ca8fe2
--- /dev/null
+++ b/dev-db/libiodbc/files/digest-libiodbc-3.51.1-r1
@@ -0,0 +1 @@
+MD5 c63b6f3d7bc459bdf791517c84402160 libiodbc-3.51.1.tar.gz 540563
diff --git a/dev-db/libiodbc/libiodbc-3.51.1-r1.ebuild b/dev-db/libiodbc/libiodbc-3.51.1-r1.ebuild
new file mode 100644
index 000000000000..3e5cd11e6d8e
--- /dev/null
+++ b/dev-db/libiodbc/libiodbc-3.51.1-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libiodbc/libiodbc-3.51.1-r1.ebuild,v 1.1 2004/02/01 12:29:11 tantive Exp $
+S=${WORKDIR}/${P}
+DESCRIPTION="iODBC is the acronym for Independent Open DataBase Connectivity, an Open Source platform independent implementation of both the ODBC and X/Open specifications. It is rapidly emerging as the industry standard for developing solutions that are language, platform and database independent."
+SRC_URI="http://www.iodbc.org/dist/libiodbc-${PV}.tar.gz"
+HOMEPAGE="http://www.ioodbc.com"
+LICENSE="LGPL-2 BSD"
+DEPEND="gtk? ( =x11-libs/gtk+-1* )"
+IUSE="gtk"
+KEYWORDS="~x86"
+SLOT=0
+
+src_compile() {
+	local myconf
+	myconf="--prefix=${D}/usr/local --exec-prefix=${D}/usr/local --with-iodbc-inidir=/etc"
+	use gtk || myconf="$myconf --disable-gui --disable-gtktest"
+	econf ${myconf}
+	emake
+}
+
+src_install () {
+	make install || die "make install failed"
+	## need to fix *.la
+	cd ${D}/usr/local/lib
+	for file in `ls *.la`; do
+	sed -i "s:"${D}"/usr/local:/usr/local:" $file;
+	done
+}
diff --git a/dev-db/libiodbc/libiodbc-3.51.1.ebuild b/dev-db/libiodbc/libiodbc-3.51.1.ebuild
deleted file mode 100644
index 2018a44102e9..000000000000
--- a/dev-db/libiodbc/libiodbc-3.51.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libiodbc/libiodbc-3.51.1.ebuild,v 1.1 2003/12/01 15:52:15 tantive Exp $
-S=${WORKDIR}/${P}
-DESCRIPTION="iODBC is the acronym for Independent Open DataBase Connectivity, an Open Source platform independent implementation of both the ODBC and X/Open specifications. It is rapidly emerging as the industry standard for developing solutions that are language, platform and database independent."
-SRC_URI="http://www.iodbc.org/dist/libiodbc-${PV}.tar.gz"
-HOMEPAGE="http://www.ioodbc.com"
-LICENSE="LGPL-2 BSD"
-DEPEND=""
-KEYWORDS="~x86"
-SLOT=0
-
-src_compile() {
-	./configure --prefix=${D}/usr/local --with-iodbc-inidir=/etc
-	make
-}
-
-src_install () {
-	make install || die "make install failed"
-}
-- 
cgit v1.2.3-65-gdbad