From 7d3488e5517cc9fa1d3b4f279b5f41f17342221e Mon Sep 17 00:00:00 2001 From: Akinori Hattori Date: Sat, 28 Apr 2007 10:08:23 +0000 Subject: [PATCH] use sed instead. Package-Manager: portage-2.1.2.2 --- dev-db/qdbm/ChangeLog | 7 +- dev-db/qdbm/Manifest | 37 ++------ 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 ---------------------- 6 files changed, 17 insertions(+), 156 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 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/Manifest b/dev-db/qdbm/Manifest index 7cb97ac12ae4..d1981b67bed6 100644 --- a/dev-db/qdbm/Manifest +++ b/dev-db/qdbm/Manifest @@ -1,10 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX 1.8.75-javacflags.patch 275 RMD160 d23de0d4346c4ac4bcf21240b883b4105d1bdd72 SHA1 2f545c1d97f631063fcdd4fba32d4db09057f2b6 SHA256 0b711384f9751d59f1fbc81253a2436a7eb4e4e6630db6f25598932a4ec87708 -MD5 6a06708054c9827e8a830b770012173e files/1.8.75-javacflags.patch 275 -RMD160 d23de0d4346c4ac4bcf21240b883b4105d1bdd72 files/1.8.75-javacflags.patch 275 -SHA256 0b711384f9751d59f1fbc81253a2436a7eb4e4e6630db6f25598932a4ec87708 files/1.8.75-javacflags.patch 275 AUX qdbm-1.8.75-runpath.diff 1689 RMD160 e5f358b2c37ce69a4a5f814f62d87e2cb23288db SHA1 5a65a4aa0ad6f4260aff71e1dca82da988d04fb1 SHA256 216f308394592ff8f8c4ee3da36e29b5d99e9b38d27d015c63a26efadb223af2 MD5 1dedd54a023736f0d5dbc22d1459b88d files/qdbm-1.8.75-runpath.diff 1689 RMD160 e5f358b2c37ce69a4a5f814f62d87e2cb23288db files/qdbm-1.8.75-runpath.diff 1689 @@ -28,18 +21,14 @@ EBUILD qdbm-1.8.74.ebuild 1832 RMD160 b7c795f82651414be5eb7824eec5b998a986ebf8 S MD5 bf8db6eb767d440a9c55e3429a33a2ca qdbm-1.8.74.ebuild 1832 RMD160 b7c795f82651414be5eb7824eec5b998a986ebf8 qdbm-1.8.74.ebuild 1832 SHA256 f236f948fa4da113e12a7985e60e2b67f042fd839fab688b0319bb30e2402ad9 qdbm-1.8.74.ebuild 1832 -EBUILD qdbm-1.8.75-r1.ebuild 1890 RMD160 34bc75a2f38e7da4e92cfd2f81f6c43970f9b009 SHA1 9db48b3eff5a9983a4bfbb868a63696cdd2b1005 SHA256 cb5cc736124a8dca49dd27a46ac5984403d2e6a4ed26d9201361d644fdf3294f -MD5 d0707d9967eb90ab6a2601eec3ffa902 qdbm-1.8.75-r1.ebuild 1890 -RMD160 34bc75a2f38e7da4e92cfd2f81f6c43970f9b009 qdbm-1.8.75-r1.ebuild 1890 -SHA256 cb5cc736124a8dca49dd27a46ac5984403d2e6a4ed26d9201361d644fdf3294f qdbm-1.8.75-r1.ebuild 1890 -EBUILD qdbm-1.8.75.ebuild 1837 RMD160 d71908fbf6cbfead636a1ab806a0bac6134e8a5b SHA1 8b3d8f585c5e57ba889b1ebc3470e98af1a3a742 SHA256 4bd3cba21fb390b1fb9022d69e2da54522347b48e1c9d245ba12885e12ed526f -MD5 ddbe88d9bb281c1d37a2121be7d330ba qdbm-1.8.75.ebuild 1837 -RMD160 d71908fbf6cbfead636a1ab806a0bac6134e8a5b qdbm-1.8.75.ebuild 1837 -SHA256 4bd3cba21fb390b1fb9022d69e2da54522347b48e1c9d245ba12885e12ed526f qdbm-1.8.75.ebuild 1837 -MISC ChangeLog 11913 RMD160 ae4b8cfbad8be483d74f851ba95c1fda5a62d9d9 SHA1 ca8c2249c5cf4224b30e5cca3cf5b0d018ac90a3 SHA256 b9e967a74eaba7cbd68c50914824749aa4999b541e27b3f964fa9b331f3dd05c -MD5 41ebd43e893096c9542697ea670b776b ChangeLog 11913 -RMD160 ae4b8cfbad8be483d74f851ba95c1fda5a62d9d9 ChangeLog 11913 -SHA256 b9e967a74eaba7cbd68c50914824749aa4999b541e27b3f964fa9b331f3dd05c ChangeLog 11913 +EBUILD qdbm-1.8.75-r1.ebuild 1901 RMD160 cd2ffdbacced841e904e81684567772e3f27170a SHA1 0b1a0afd71247341f06ba4d7f9b1099f5ba8cdac SHA256 b1c5d5183268cfdaa2b0ed762a2c91df5171927b63d7e5ad5505c0a35eac85e6 +MD5 20ed9d0ee19288b6855a73d9df9261ea qdbm-1.8.75-r1.ebuild 1901 +RMD160 cd2ffdbacced841e904e81684567772e3f27170a qdbm-1.8.75-r1.ebuild 1901 +SHA256 b1c5d5183268cfdaa2b0ed762a2c91df5171927b63d7e5ad5505c0a35eac85e6 qdbm-1.8.75-r1.ebuild 1901 +MISC ChangeLog 12060 RMD160 9ddef1b7af52311bb5272c1924fc128bf08e4021 SHA1 a018f89365fdd567cd62ccf67ef4d31f4350081c SHA256 ca8c9f4c23da4c2de0f737d35b259a97b00e5643d20eaec0765cf127fd268ebe +MD5 ee99fd8766cb56de6e25b6ec5841f820 ChangeLog 12060 +RMD160 9ddef1b7af52311bb5272c1924fc128bf08e4021 ChangeLog 12060 +SHA256 ca8c9f4c23da4c2de0f737d35b259a97b00e5643d20eaec0765cf127fd268ebe ChangeLog 12060 MISC metadata.xml 230 RMD160 8e45109dbaf3c193afdb318002c1def7cb62dfa1 SHA1 9bd7aea9376c216b3f55303d1334a337cd6f06a2 SHA256 87fc07a55ee7814a0505ae1c24a871ac29ae7691c5383550647382a2b26277ae MD5 c9f54ac0eadf3d14a44e5dc692f0df73 metadata.xml 230 RMD160 8e45109dbaf3c193afdb318002c1def7cb62dfa1 metadata.xml 230 @@ -50,16 +39,6 @@ SHA256 b076d6c8fbe69e66e691dc6b87a78bb453a8c5582aa23dbff1424b2906f405ba files/di MD5 bceaa6cb163a3d510e1054b2efb563c4 files/digest-qdbm-1.8.74 235 RMD160 9ba4865efe57b423cb4bf98179d1ff690f80e352 files/digest-qdbm-1.8.74 235 SHA256 80e19290de56f3507f6d4121c84017438836e2654f50be6b8d065c8414bc3273 files/digest-qdbm-1.8.74 235 -MD5 768cd16fc12241afaf719e195b3e5df4 files/digest-qdbm-1.8.75 235 -RMD160 71e1983251e1eb4f9df72514d2b6fd7ec22d3d50 files/digest-qdbm-1.8.75 235 -SHA256 54c8b1053ac0ebd5104ba1788eb9b3e6cdd32824cee5f5cbeb2e0a7758eb9633 files/digest-qdbm-1.8.75 235 MD5 768cd16fc12241afaf719e195b3e5df4 files/digest-qdbm-1.8.75-r1 235 RMD160 71e1983251e1eb4f9df72514d2b6fd7ec22d3d50 files/digest-qdbm-1.8.75-r1 235 SHA256 54c8b1053ac0ebd5104ba1788eb9b3e6cdd32824cee5f5cbeb2e0a7758eb9633 files/digest-qdbm-1.8.75-r1 235 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.3 (GNU/Linux) - -iD8DBQFGL3wQcxLzpIGCsLQRAlDJAJ9xZsibPAT45i5+OBMVx9UMOAUnwgCeLO9J -9CuJuJGiZ6bFqlBExhkZy08= -=hWZ6 ------END PGP SIGNATURE----- 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 - -} -- 2.26.2