diff options
-rw-r--r-- | dev-db/libdbi/ChangeLog | 9 | ||||
-rw-r--r-- | dev-db/libdbi/files/libdbi-0.8.1-pkg-config.patch | 8 | ||||
-rw-r--r-- | dev-db/libdbi/files/libdbi-0.8.3-doc-build-fix.patch | 15 | ||||
-rw-r--r-- | dev-db/libdbi/files/libdbi-0.8.4-doc-build-fix.patch | 22 | ||||
-rw-r--r-- | dev-db/libdbi/files/libdbi-0.8.4-fix-ac-macro.patch | 12 | ||||
-rw-r--r-- | dev-db/libdbi/libdbi-0.8.3.ebuild | 47 | ||||
-rw-r--r-- | dev-db/libdbi/libdbi-0.8.4.ebuild | 59 |
7 files changed, 8 insertions, 164 deletions
diff --git a/dev-db/libdbi/ChangeLog b/dev-db/libdbi/ChangeLog index 6cbe28ce9155..7754a6b8e1db 100644 --- a/dev-db/libdbi/ChangeLog +++ b/dev-db/libdbi/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-db/libdbi # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi/ChangeLog,v 1.63 2014/08/10 20:00:32 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi/ChangeLog,v 1.64 2014/11/23 15:01:09 pacho Exp $ + + 23 Nov 2014; Pacho Ramos <pacho@gentoo.org> + -files/libdbi-0.8.1-pkg-config.patch, -files/libdbi-0.8.3-doc-build-fix.patch, + -files/libdbi-0.8.4-doc-build-fix.patch, + -files/libdbi-0.8.4-fix-ac-macro.patch, -libdbi-0.8.3.ebuild, + -libdbi-0.8.4.ebuild: + Drop old 10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> libdbi-0.8.3.ebuild, libdbi-0.8.4.ebuild, libdbi-0.9.0.ebuild: diff --git a/dev-db/libdbi/files/libdbi-0.8.1-pkg-config.patch b/dev-db/libdbi/files/libdbi-0.8.1-pkg-config.patch deleted file mode 100644 index a770ef3ceb51..000000000000 --- a/dev-db/libdbi/files/libdbi-0.8.1-pkg-config.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- configure.in.orig 2008-09-23 15:16:20.000000000 -0400 -+++ configure.in 2008-09-23 15:16:39.000000000 -0400 -@@ -149,4 +149,5 @@ - doc/Makefile - include/Makefile - include/dbi/Makefile -+ dbi.pc - ]) diff --git a/dev-db/libdbi/files/libdbi-0.8.3-doc-build-fix.patch b/dev-db/libdbi/files/libdbi-0.8.3-doc-build-fix.patch deleted file mode 100644 index 831d6d25c2b7..000000000000 --- a/dev-db/libdbi/files/libdbi-0.8.3-doc-build-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Nuar libdbi-0.8.3.orig/configure.in libdbi-0.8.3/configure.in ---- libdbi-0.8.3.orig/configure.in 2008-10-09 17:09:09.303141877 -0700 -+++ libdbi-0.8.3/configure.in 2008-10-09 17:10:48.100635797 -0700 -@@ -149,7 +149,8 @@ --ac_docs="YES" -+ac_docs="no" - AC_ARG_ENABLE(docs, - [ --disable-docs do not build and install the documentation.], -- [ ac_docs="NO" ]) -+ [ ac_docs="$enableval" ], -+ [ ac_docs="no" ]) - --if test "$ac_docs" = "YES"; then -+if test "$ac_docs" = "yes"; then - dnl AC_PATH_PROGS(myjade, openjade jade) diff --git a/dev-db/libdbi/files/libdbi-0.8.4-doc-build-fix.patch b/dev-db/libdbi/files/libdbi-0.8.4-doc-build-fix.patch deleted file mode 100644 index 2891a7839002..000000000000 --- a/dev-db/libdbi/files/libdbi-0.8.4-doc-build-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Nuar libdbi-0.8.4.orig/configure.in libdbi-0.8.4/configure.in ---- libdbi-0.8.4.orig/configure.in 2012-02-21 08:36:15.560231962 +0000 -+++ libdbi-0.8.4/configure.in 2012-02-21 08:39:07.910615238 +0000 -@@ -147,14 +147,13 @@ - dnl See whether to build the docs - dnl ============================== - --ac_docs="YES" -+ac_docs="yes" - AC_ARG_ENABLE(docs, - [ --disable-docs do not build and install the documentation.], -- [ if test "$enable_docs" = "no"; then -- ac_docs="NO" -- fi ]) -+ [ ac_docs="$enableval" ], -+ [ ac_docs="no" ]) - --if test "$ac_docs" = "YES"; then -+if test "$ac_docs" = "yes"; then - dnl AC_PATH_PROGS(myjade, openjade jade) - dnl if test "x$myjade" != "x"; then - docs_subdirs="doc" diff --git a/dev-db/libdbi/files/libdbi-0.8.4-fix-ac-macro.patch b/dev-db/libdbi/files/libdbi-0.8.4-fix-ac-macro.patch deleted file mode 100644 index 4dc286856b6b..000000000000 --- a/dev-db/libdbi/files/libdbi-0.8.4-fix-ac-macro.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur libdbi-0.8.4-old/configure.in libdbi-0.8.4/configure.in ---- libdbi-0.8.4-old/configure.in 2013-05-14 01:45:25.595869576 +0000 -+++ libdbi-0.8.4/configure.in 2013-05-14 01:47:09.775467777 +0000 -@@ -3,7 +3,7 @@ - AM_MAINTAINER_MODE - - AM_INIT_AUTOMAKE(libdbi, 0.8.4) --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - AC_CONFIG_MACRO_DIR([m4]) - - dnl Library versioning diff --git a/dev-db/libdbi/libdbi-0.8.3.ebuild b/dev-db/libdbi/libdbi-0.8.3.ebuild deleted file mode 100644 index 7c7efa9bf42a..000000000000 --- a/dev-db/libdbi/libdbi-0.8.3.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi/libdbi-0.8.3.ebuild,v 1.23 2014/08/10 20:00:32 slyfox Exp $ - -inherit eutils autotools multilib - -DESCRIPTION="libdbi is a database-independent abstraction layer in C, similar to the DBI/DBD layer in Perl" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -HOMEPAGE="http://libdbi.sourceforge.net/" -LICENSE="LGPL-2.1" -RDEPEND="" -DEPEND=">=sys-apps/sed-4 - virtual/pkgconfig - doc? ( app-text/openjade ) - ${RDEPEND}" -PDEPEND=">=dev-db/libdbi-drivers-0.8.3" -IUSE="doc" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -SLOT=0 - -src_unpack() { - unpack ${A} - chown -R portage:portage "${S}" - cd "${S}" - epatch "${FILESDIR}"/libdbi-0.8.1-pkg-config.patch - cp -f "${FILESDIR}"/dbi.pc.in "${S}"/dbi.pc.in - epatch "${FILESDIR}"/libdbi-0.8.3-doc-build-fix.patch - - # configure.in has been changed - eautoreconf -} - -src_compile() { - # should append CFLAGS, not replace them - sed -i.orig -e 's/^CFLAGS = /CFLAGS += /g' src/Makefile.in - econf $(use_enable doc docs) - emake || die "emake failed" -} - -src_install () { - emake install DESTDIR="${D}" || die "make install failed" - dodoc AUTHORS ChangeLog README README.osx TODO - - # syslog-ng requires dbi.pc - insinto /usr/$(get_libdir)/pkgconfig/ - doins dbi.pc -} diff --git a/dev-db/libdbi/libdbi-0.8.4.ebuild b/dev-db/libdbi/libdbi-0.8.4.ebuild deleted file mode 100644 index be82cf9ae40d..000000000000 --- a/dev-db/libdbi/libdbi-0.8.4.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi/libdbi-0.8.4.ebuild,v 1.14 2014/08/10 20:00:32 slyfox Exp $ - -EAPI=4 - -inherit eutils autotools multilib - -DESCRIPTION="libdbi is a database-independent abstraction layer in C, similar to the DBI/DBD layer in Perl" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -HOMEPAGE="http://libdbi.sourceforge.net/" -LICENSE="LGPL-2.1" - -IUSE="doc static-libs" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -SLOT=0 - -DOCS="AUTHORS ChangeLog README README.osx TODO" - -RDEPEND="" -DEPEND="${RDEPEND} - >=sys-apps/sed-4 - virtual/pkgconfig - doc? ( app-text/openjade ) -" -PDEPEND=">=dev-db/libdbi-drivers-0.8.3" # On purpose, libdbi-drivers 0.8.4 does not exist - -src_unpack() { - unpack ${A} - chown -R portage:portage "${S}" -} - -src_prepare() { - epatch "${FILESDIR}/${P}-fix-ac-macro.patch" - epatch "${FILESDIR}"/libdbi-0.8.1-pkg-config.patch - cp -f "${FILESDIR}"/dbi.pc.in "${S}"/dbi.pc.in - epatch "${FILESDIR}"/libdbi-0.8.4-doc-build-fix.patch - - # configure.in has been changed - eautoreconf - # should append CFLAGS, not replace them - sed -i.orig -e 's/^CFLAGS = /CFLAGS += /g' src/Makefile.in -} - -src_configure() { - econf \ - $(use_enable doc docs) \ - $(use_enable static-libs static) -} - -src_install () { - default - - prune_libtool_files --all - - # syslog-ng requires dbi.pc - insinto /usr/$(get_libdir)/pkgconfig/ - doins dbi.pc -} |