From e3439162fef8803f913476e1bca783da6b56a5b3 Mon Sep 17 00:00:00 2001 From: Akinori Hattori Date: Sat, 28 Apr 2007 10:08:23 +0000 Subject: use sed instead. (Portage version: 2.1.2.2) --- dev-db/qdbm/ChangeLog | 7 +- dev-db/qdbm/files/1.8.75-javacflags.patch | 11 --- dev-db/qdbm/files/digest-qdbm-1.8.75 | 3 - dev-db/qdbm/qdbm-1.8.75-r1.ebuild | 5 +- dev-db/qdbm/qdbm-1.8.75.ebuild | 110 ------------------------------ 5 files changed, 9 insertions(+), 127 deletions(-) delete mode 100644 dev-db/qdbm/files/1.8.75-javacflags.patch delete mode 100644 dev-db/qdbm/files/digest-qdbm-1.8.75 delete mode 100644 dev-db/qdbm/qdbm-1.8.75.ebuild (limited to 'dev-db/qdbm') diff --git a/dev-db/qdbm/ChangeLog b/dev-db/qdbm/ChangeLog index 0d4b9f74ff1b..0efecd95471a 100644 --- a/dev-db/qdbm/ChangeLog +++ b/dev-db/qdbm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-db/qdbm # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/ChangeLog,v 1.105 2007/04/25 16:04:30 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/ChangeLog,v 1.106 2007/04/28 10:08:23 hattya Exp $ + + 28 Apr 2007; Akinori Hattori + -files/1.8.75-javacflags.patch, -qdbm-1.8.75.ebuild, + qdbm-1.8.75-r1.ebuild: + use sed instead. *qdbm-1.8.75-r1 (25 Apr 2007) diff --git a/dev-db/qdbm/files/1.8.75-javacflags.patch b/dev-db/qdbm/files/1.8.75-javacflags.patch deleted file mode 100644 index 1ccccd9d7a72..000000000000 --- a/dev-db/qdbm/files/1.8.75-javacflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/qdbm-1.8.75/java/Makefile.in -+++ b/qdbm-1.8.75/java/Makefile.in -@@ -44,7 +44,7 @@ DESTDIR = - MYJAVAHOME = @MYJAVAHOME@ - JVMPLATFORM = @JVMPLATFORM@ - JAVAC = @JAVAC@ --JAVACFLAGS = -d . -+JAVACFLAGS := $(JAVACFLAGS) -d . - JAR = @JAR@ - JAVAH = @JAVAH@ - JAVADOC = @JAVADOC@ diff --git a/dev-db/qdbm/files/digest-qdbm-1.8.75 b/dev-db/qdbm/files/digest-qdbm-1.8.75 deleted file mode 100644 index b6ed772f2b9c..000000000000 --- a/dev-db/qdbm/files/digest-qdbm-1.8.75 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 9f1fca3bf60116b3b3767d32337cde8b qdbm-1.8.75.tar.gz 947612 -RMD160 a7886b98ef4006486b87ac51a8edb62a927a6238 qdbm-1.8.75.tar.gz 947612 -SHA256 539b5f7d024a9f5d64dd757da7c636c934f5c74e2ad3a9fa60af7dd94bf6fde5 qdbm-1.8.75.tar.gz 947612 diff --git a/dev-db/qdbm/qdbm-1.8.75-r1.ebuild b/dev-db/qdbm/qdbm-1.8.75-r1.ebuild index 96547a9dec7a..6f2c5c99e3e2 100644 --- a/dev-db/qdbm/qdbm-1.8.75-r1.ebuild +++ b/dev-db/qdbm/qdbm-1.8.75-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.75-r1.ebuild,v 1.1 2007/04/25 16:04:30 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.75-r1.ebuild,v 1.2 2007/04/28 10:08:23 hattya Exp $ inherit eutils java-pkg-opt-2 multilib @@ -26,9 +26,10 @@ src_unpack() { unpack ${A} cd "${S}" + sed -i "/^JAVACFLAGS/s:$: ${JAVACFLAGS}:" java/Makefile.in + epatch "${FILESDIR}"/${P}-runpath.diff epatch "${FILESDIR}"/${PN}-perl-runpath-vendor.diff - epatch "${FILESDIR}"/1.8.75-javacflags.patch } diff --git a/dev-db/qdbm/qdbm-1.8.75.ebuild b/dev-db/qdbm/qdbm-1.8.75.ebuild deleted file mode 100644 index e210c9654ee4..000000000000 --- a/dev-db/qdbm/qdbm-1.8.75.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.75.ebuild,v 1.2 2007/03/12 14:04:29 hattya Exp $ - -inherit eutils java-pkg-opt-2 multilib - -IUSE="debug java perl ruby zlib" - -DESCRIPTION="Quick Database Manager" -HOMEPAGE="http://qdbm.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -SLOT="0" - -RDEPEND="java? ( >=virtual/jre-1.4 ) - perl? ( dev-lang/perl ) - ruby? ( virtual/ruby ) - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND} - java? ( >=virtual/jdk-1.4 )" - -src_unpack() { - - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${P}-runpath.diff - epatch "${FILESDIR}"/${PN}-perl-runpath-vendor.diff - -} - -src_compile() { - - econf \ - $(use_enable debug) \ - $(use_enable zlib) \ - --enable-pthread \ - --enable-iconv \ - || die - emake || die - - local u - - for u in java perl ruby; do - if ! use ${u}; then - continue - fi - - cd ${u} - econf || die - emake || die - cd - - done - -} - -src_test() { - - emake -j1 check || die - - local u - - for u in java perl ruby; do - if ! use ${u}; then - continue - fi - - cd ${u} - emake -j1 check || die - cd - - done - -} - -src_install() { - - emake DESTDIR="${D}" install || die - - dodoc ChangeLog NEWS README THANKS - dohtml *.html - - rm -rf "${D}"/usr/share/${PN} - - local u mydatadir=/usr/share/doc/${P}/html - - for u in java perl ruby; do - if ! use ${u}; then - continue - fi - - cd ${u} - emake DESTDIR="${D}" MYDATADIR=${mydatadir}/${u} install || die - - case ${u} in - java) - java-pkg_dojar "${D}"/usr/$(get_libdir)/*.jar - rm -f "${D}"/usr/$(get_libdir)/*.jar - ;; - perl) - rm "${D}"/$(perl -V:installarchlib | cut -d\' -f2)/*.pod - ;; - esac - cd - - done - - rm -f "${D}"/usr/bin/*test - -} -- cgit v1.2.3-65-gdbad