From e0c58a085c2d509ec13a3d38107d8b872caa7269 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Mon, 26 Jul 2010 11:21:19 +0000 Subject: old Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- dev-db/unixODBC/Manifest | 5 -- ...350-unixODBC-2.2.12-gODBCConfig-as-needed.patch | 14 ---- .../files/360-unixODBC-2.2.12-libltdlfixes.patch | 35 -------- dev-db/unixODBC/unixODBC-2.2.12.ebuild | 96 ---------------------- 4 files changed, 150 deletions(-) delete mode 100644 dev-db/unixODBC/files/350-unixODBC-2.2.12-gODBCConfig-as-needed.patch delete mode 100644 dev-db/unixODBC/files/360-unixODBC-2.2.12-libltdlfixes.patch delete mode 100644 dev-db/unixODBC/unixODBC-2.2.12.ebuild diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest index dc4fe2544e40..4799eb7d42c9 100644 --- a/dev-db/unixODBC/Manifest +++ b/dev-db/unixODBC/Manifest @@ -1,9 +1,4 @@ -AUX 350-unixODBC-2.2.12-gODBCConfig-as-needed.patch 382 RMD160 080c2947d564ed320071ebd7750cda50886084d6 SHA1 11f482aeeea33fc196b45ba35120755ac88c2978 SHA256 460bbf2dd174d0286b89330d991c3f7030ca7256bce8b16ebf4593572cf7be85 -AUX 360-unixODBC-2.2.12-libltdlfixes.patch 1124 RMD160 ee215893cbdb2aa9672ec63501cd0bddaf08c397 SHA1 0d8fc8b5db51c7bf3ce72abfe7ba8119808702ad SHA256 974942040de5e471274b109ae478f05dea75ac0e5042aaf9eb1acd3f2461d4bf -DIST unixODBC-2.2.12-r0-patches.tar.bz2 6968 RMD160 5d53a41f4645cd366e18405d23acbf3f87dc9eda SHA1 1aa13bf8a6d031583fae844a7d0d503405607f28 SHA256 da58a4c4a08ccef6416af4cac17bd0d6e89f1c513aecab21d9092bcbae0faefd -DIST unixODBC-2.2.12.tar.gz 2798077 RMD160 13c9ec87c3fff4a1fceb45ff7a552a0fa8666b16 SHA1 d1cb286fb538c664549153165e2b9183b58a627b SHA256 d8b425e9cd8bf55ac21653d27e017045013a155a6149ca2930e257a146f9fe40 DIST unixODBC-2.3.0.tar.gz 1804749 RMD160 166a96c31fe013ced6b6ef93da5871f672cfe456 SHA1 b2839b5210906e3ee286a4b621f177db9c7be7a8 SHA256 15a7a855a2951a6af7137379bfcdccc15626b869c4804a1d1536cd37e9f3872c -EBUILD unixODBC-2.2.12.ebuild 2184 RMD160 1f3ff3a56cbef0b3fbe339aea54378f3b90a0fad SHA1 de6596261f0bc28c64169669f204f8fec471ed7d SHA256 34e45016399527fcebd0b686e85d3fc3e894d2e4eb6fdffc4032faf72fc969d5 EBUILD unixODBC-2.3.0.ebuild 1234 RMD160 0baeb264d57d07fee365cff6baa605d4280c421c SHA1 fcae97a8a585835cc24df33e1f368ac4c1ab7ba2 SHA256 3c5341ba233a904a1d3b249fab873ebb1248ae2516215dbfb9f033f1a8e9f84c MISC ChangeLog 12696 RMD160 845b2908aa303e0c2ff501a201059d66d3f6b3f9 SHA1 36a7ab35a8773d536bb767f1beeacad7a9a324ee SHA256 1fa253e83360c15b09c8994f6b9e29706a86661b549f5c0ebf3f40a35a97e58f MISC metadata.xml 468 RMD160 91e1f44d6130fb6a8451d7fb035560ba096cbefe SHA1 58fbbf20f05a3276cbb8300d6d4d687c445ac3cd SHA256 818358c4462d990882a9dfe798266a4b0879967741b9148ab6a4a89029eaae27 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 deleted file mode 100644 index 566ad68aceb0..000000000000 --- a/dev-db/unixODBC/files/350-unixODBC-2.2.12-gODBCConfig-as-needed.patch +++ /dev/null @@ -1,14 +0,0 @@ --- 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/files/360-unixODBC-2.2.12-libltdlfixes.patch b/dev-db/unixODBC/files/360-unixODBC-2.2.12-libltdlfixes.patch deleted file mode 100644 index c26f1a8a3e26..000000000000 --- a/dev-db/unixODBC/files/360-unixODBC-2.2.12-libltdlfixes.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -Naur unixODBC-2.2.12.orig/configure.in unixODBC-2.2.12/configure.in ---- unixODBC-2.2.12.orig/configure.in 2008-05-29 15:54:09.000000000 +0200 -+++ unixODBC-2.2.12/configure.in 2008-05-29 15:58:32.000000000 +0200 -@@ -163,9 +163,6 @@ - dnl Configure libtool - AM_PROG_LIBTOOL - --dnl Configure libltdl --AC_CONFIG_SUBDIRS(libltdl) -- - use_builtin_libtool="no" - - dnl override the libtool lines if we use the system libs -diff -Naur unixODBC-2.2.12.orig/exe/Makefile.am unixODBC-2.2.12/exe/Makefile.am ---- unixODBC-2.2.12.orig/exe/Makefile.am 2008-05-29 15:54:09.000000000 +0200 -+++ unixODBC-2.2.12/exe/Makefile.am 2008-05-29 15:57:14.000000000 +0200 -@@ -103,6 +103,6 @@ - - if WITHLT - dltest_DEPENDENCIES = $(LIBLTDL) --dltest_LDADD = $(LIBLTDL) $(LIBADD_DL) - else - endif -+dltest_LDADD = $(LIBLTDL) $(LIBADD_DL) -diff -Naur unixODBC-2.2.12.orig/Makefile.am unixODBC-2.2.12/Makefile.am ---- unixODBC-2.2.12.orig/Makefile.am 2008-05-29 15:54:09.000000000 +0200 -+++ unixODBC-2.2.12/Makefile.am 2008-05-29 15:57:56.000000000 +0200 -@@ -3,7 +3,6 @@ - log \ - lst \ - ini \ -- libltdl \ - odbcinst \ - DriverManager \ - odbcinstQ \ diff --git a/dev-db/unixODBC/unixODBC-2.2.12.ebuild b/dev-db/unixODBC/unixODBC-2.2.12.ebuild deleted file mode 100644 index c24d346c49a8..000000000000 --- a/dev-db/unixODBC/unixODBC-2.2.12.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2010 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.17 2010/06/19 00:34:18 abcd Exp $ - -PATCH_VERSION="2.2.12-r0" -PATCH_P="${PN}-${PATCH_VERSION}-patches" - -inherit eutils multilib autotools gnuconfig libtool - -DESCRIPTION="ODBC Interface for Linux." -HOMEPAGE="http://www.unixodbc.org/" -SRC_URI="http://www.unixodbc.org/${P}.tar.gz - mirror://gentoo/${PATCH_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -IUSE="gnome" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" - -RDEPEND=">=sys-libs/readline-4.1 - >=sys-libs/ncurses-5.2 - gnome? ( gnome-base/libgnomeui ) - sys-devel/libtool" -DEPEND="${RDEPEND} - gnome? ( dev-vcs/cvs )" # see Bug 173256 - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${WORKDIR}"/${PATCH_P}/* - epatch \ - "${FILESDIR}/350-${P}-gODBCConfig-as-needed.patch" \ - "${FILESDIR}/360-${P}-libltdlfixes.patch" - - # Remove bundled libltdl copy - rm -rf libltdl - - eautoreconf - - if use gnome ; then - cd gODBCConfig - touch ChangeLog - autopoint -f || die "autopoint -f failed" - eautoreconf --install - fi -} - -src_compile() { - local myconf="--enable-gui=no" - - econf --host=${CHOST} \ - --prefix=/usr \ - --sysconfdir=/etc/${PN} \ - --libdir=/usr/$(get_libdir) \ - --enable-static \ - --enable-fdb \ - --enable-ltdllib \ - ${myconf} || die "econf failed" - emake -j1 || die "emake failed" - - 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 - econf --host=${CHOST} \ - --with-odbc="${S}" \ - --enable-static \ - --prefix=/usr \ - --sysconfdir=/etc/${PN} || die "econf gODBCConfig failed" - ln -s ../depcomp . - ln -s ../libtool . - - emake || die "emake gODBCConfig failed" - cd .. - fi -} - -src_install() { - emake -j1 DESTDIR="${D}" install || die "emake install failed" - - if use gnome; - then - cd gODBCConfig - emake DESTDIR="${D}" install || die "emake gODBCConfig install failed" - cd .. - fi - - dodoc AUTHORS ChangeLog NEWS README* - find doc/ -name "Makefile*" -exec rm '{}' \; - dohtml doc/* - prepalldocs -} -- cgit v1.2.3-65-gdbad