Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys-libs/db/ChangeLog6
-rw-r--r--sys-libs/db/Manifest36
-rw-r--r--sys-libs/db/db-4.2.52_p4-r2.ebuild44
-rw-r--r--sys-libs/db/db-4.3.29-r2.ebuild42
4 files changed, 73 insertions, 55 deletions
diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 7623486787c1..7760802023c6 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-libs/db
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.164 2006/07/25 21:14:14 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.165 2006/07/26 09:11:38 azarah Exp $
+
+ 26 Jul 2006; Martin Schlemmer <azarah@gentoo.org> db-4.2.52_p4-r2.ebuild,
+ db-4.3.29-r2.ebuild:
+ Fixup static 'lib' paths in new java stuff. Fixup some quoting.
*db-4.3.29-r2 (25 Jul 2006)
*db-4.2.52_p4-r2 (25 Jul 2006)
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index d12a269c132f..a61db7821f22 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX db-1.85-gentoo-paths.patch 684 RMD160 cbfb484127600e180eb432d3f5aa31deba43e8bf SHA1 42a105f2503315a28b1e7f7aad71ee3bd4a56a13 SHA256 049052c74c544ac1c1f3b1b91c3e43df76b135c610148212679dfd324470cf2f
MD5 86aca9a49a082dc56e4103ec8112f344 files/db-1.85-gentoo-paths.patch 684
RMD160 cbfb484127600e180eb432d3f5aa31deba43e8bf files/db-1.85-gentoo-paths.patch 684
@@ -91,7 +94,7 @@ MD5 f8edd1cf6535cd62f9b8ff81e0474273 files/patch.3.2.9.2 495
RMD160 c9982844d99e1c78efddcb7b7615c41f6225e6b9 files/patch.3.2.9.2 495
SHA256 61db874796fe8789b0045f456285b27c5b8b7b8902a5e342a115456015716d0e files/patch.3.2.9.2 495
DIST db-1.85-r3.1.patch.bz2 14641 RMD160 463c9d6cf013b28ff2c364d3f2ced378b334fea3 SHA1 95d36410f0fee98f192eee04c2a1f74cac106270 SHA256 88e3095b191fe425d0192d052595ab838ad4ef6324aac0a9e338fd6df7ae40d4
-DIST db-1.85.patch.bz2 15277 RMD160 a1b024f5761a531d4f52a35b309242c4a4be38d1 SHA256 4339a08fb0b2c001ba819835e190996539e80f2cb6031ca4395f40f3363f8bc5
+DIST db-1.85.patch.bz2 15277 RMD160 a1b024f5761a531d4f52a35b309242c4a4be38d1 SHA1 e4161e1e56c32c6950b0962e6673c6d946e6094b SHA256 4339a08fb0b2c001ba819835e190996539e80f2cb6031ca4395f40f3363f8bc5
DIST db-3.2.9.tar.gz 2085238 RMD160 c2c5cdb3ec0e99e5687c0861dfbf76b8878f27cb SHA1 1adcc34b6a56e51e4019e80bc56b509ac28e1035 SHA256 3eccaec87bca4ca0f5728cf4579650da9d12e331187f1e98321e5c9e9e04b108
DIST db-4.0.14.tar.gz 2701799 RMD160 9c9f2929ebae27fcedf1d8bf101b8ca960ad6a2a SHA1 a0fcf0ec521ffb7a7ea342b1ec2ea9bc9f8402ee SHA256 a7d983d88b7ba43cfd9a39bfcb0f3f489b15e4b113452e94b7c4bbca0225b7f5
DIST db-4.1.25.tar.gz 3080234 RMD160 4647dada39e270d9218264df55887f934a851658 SHA1 fc462d40046e85f715db54fc8acece99f9a7bd4c SHA256 d1247e78460a84bda2d6df97df7e6472065c675a7e1a5363d4073ae4c74f4651
@@ -153,10 +156,10 @@ EBUILD db-4.2.52_p2.ebuild 2939 RMD160 871a91d3957543d20a3df0bab121a0f1fe94a9b0
MD5 fbc30c4e8aaba33d2ad4c48a8190a14d db-4.2.52_p2.ebuild 2939
RMD160 871a91d3957543d20a3df0bab121a0f1fe94a9b0 db-4.2.52_p2.ebuild 2939
SHA256 63c3a13ef96584b6e4267bf6f85ec77710d0cf3001dc58ace3f71540f4549da1 db-4.2.52_p2.ebuild 2939
-EBUILD db-4.2.52_p4-r2.ebuild 3414 RMD160 140b690b58bca943ef5ebbc6f7609e8be68db367 SHA1 14073ec09ba071b938f5d7c0e4967bbfeb5c0ee7 SHA256 02f1658ebe08ead2e30557aeb5c94b52d09d72f390758fef1b9f74a9cd5148b1
-MD5 febeb3a34213d1b3cdb6aee159e47420 db-4.2.52_p4-r2.ebuild 3414
-RMD160 140b690b58bca943ef5ebbc6f7609e8be68db367 db-4.2.52_p4-r2.ebuild 3414
-SHA256 02f1658ebe08ead2e30557aeb5c94b52d09d72f390758fef1b9f74a9cd5148b1 db-4.2.52_p4-r2.ebuild 3414
+EBUILD db-4.2.52_p4-r2.ebuild 3522 RMD160 cec27b6e696023f9ab3d62a8accb342ddd115135 SHA1 f8df76d98954836ec97ca2b090813c58ac31c5e1 SHA256 a0d66b132225d016f42e51e0712b0ec13e51fd25b059ce5491baf8d3d26c513c
+MD5 030548fdd3bda98e3a22630cea18e530 db-4.2.52_p4-r2.ebuild 3522
+RMD160 cec27b6e696023f9ab3d62a8accb342ddd115135 db-4.2.52_p4-r2.ebuild 3522
+SHA256 a0d66b132225d016f42e51e0712b0ec13e51fd25b059ce5491baf8d3d26c513c db-4.2.52_p4-r2.ebuild 3522
EBUILD db-4.2.52_p4.ebuild 3204 RMD160 e4a42b9617c2ba9e8b5fbcbf230fc873b28838f1 SHA1 a3979f0edf3b0688a08cfd60dd226cb19ad1e406 SHA256 436113852fc6fe4334389c903a20618ee3b72364c076836df0015d7947565021
MD5 61c450caff07cb3d1af8000e85aea300 db-4.2.52_p4.ebuild 3204
RMD160 e4a42b9617c2ba9e8b5fbcbf230fc873b28838f1 db-4.2.52_p4.ebuild 3204
@@ -165,10 +168,10 @@ EBUILD db-4.3.27.ebuild 2939 RMD160 0683c7face86283a18c31f4105b73424dd1ef10e SHA
MD5 1c363b98875b5678e066d570e40c98a5 db-4.3.27.ebuild 2939
RMD160 0683c7face86283a18c31f4105b73424dd1ef10e db-4.3.27.ebuild 2939
SHA256 b71673d010d42252b367995e036d50fea1e556f758e4aed013fcb40e981532d8 db-4.3.27.ebuild 2939
-EBUILD db-4.3.29-r2.ebuild 3583 RMD160 7786d5bd1e7732025ad173f098c91b8f3dd5137d SHA1 2f7b9e2f84b4d7f6c4b9de71d460f984e152b368 SHA256 402f24514db223388ebc5ce4e5bf258e8e7eec9e2fe9ab31c333b51fc290c0a2
-MD5 c7a7b6c96b666c17a61b5a74fca19b34 db-4.3.29-r2.ebuild 3583
-RMD160 7786d5bd1e7732025ad173f098c91b8f3dd5137d db-4.3.29-r2.ebuild 3583
-SHA256 402f24514db223388ebc5ce4e5bf258e8e7eec9e2fe9ab31c333b51fc290c0a2 db-4.3.29-r2.ebuild 3583
+EBUILD db-4.3.29-r2.ebuild 3687 RMD160 4b0fc9c13423316644ac29740e2b19e3905ac0e6 SHA1 96bbd99015ed951bad5f677380549faf06927f62 SHA256 f2aa99438dacb5c1fa2ee9f28bca30b6695e5bdb0954ac2ca693ccdc209bfe52
+MD5 2665ff8ffb742a3c6c4b6c312463d70e db-4.3.29-r2.ebuild 3687
+RMD160 4b0fc9c13423316644ac29740e2b19e3905ac0e6 db-4.3.29-r2.ebuild 3687
+SHA256 f2aa99438dacb5c1fa2ee9f28bca30b6695e5bdb0954ac2ca693ccdc209bfe52 db-4.3.29-r2.ebuild 3687
EBUILD db-4.3.29.ebuild 3374 RMD160 1bca0b20493317725d11b87db21fea36c40b80f9 SHA1 a2d840b9d369a97950cc01c827b11e1be73ac57b SHA256 9d7be0a07918739fa4b9c17289c4523ef434bd653379682264f7fc933e8fb83c
MD5 12b0ee2bce33751b427bfb0e4049b1fa db-4.3.29.ebuild 3374
RMD160 1bca0b20493317725d11b87db21fea36c40b80f9 db-4.3.29.ebuild 3374
@@ -177,10 +180,10 @@ EBUILD db-4.4.20_p2.ebuild 3285 RMD160 0f35956a22cbaa6ffb6581aa3512d4da92594219
MD5 a0736c0d3d5f613122958eade29d82c3 db-4.4.20_p2.ebuild 3285
RMD160 0f35956a22cbaa6ffb6581aa3512d4da92594219 db-4.4.20_p2.ebuild 3285
SHA256 d7dc58e0301da5b832e31937d335c11fdf672f3c81abf53c0a7c535dd873cd85 db-4.4.20_p2.ebuild 3285
-MISC ChangeLog 25619 RMD160 5d32b3e0f2734dbeecb7b1d9e8fc8c9f82598774 SHA1 c826d3b5b48ea5adfe9454ae5f198319bb388a54 SHA256 3e8977d4a13d66a44d33375c64f6431212736d909e3bcf2c92c991a3eb375b37
-MD5 c8655d7ee2950ca9a08b63cd2c57aa65 ChangeLog 25619
-RMD160 5d32b3e0f2734dbeecb7b1d9e8fc8c9f82598774 ChangeLog 25619
-SHA256 3e8977d4a13d66a44d33375c64f6431212736d909e3bcf2c92c991a3eb375b37 ChangeLog 25619
+MISC ChangeLog 25785 RMD160 eb237e447eb846f5d7d9e1131a6a5133e53d750a SHA1 5f80331b6712bd4e311e0a2dfeeaad693c29eb3c SHA256 7c3f6dc9cd7e4c6b94dd709b9f0121515587d03a1166ed78b6e6eb180ca3255d
+MD5 257b54faf3286b348578e61c38253976 ChangeLog 25785
+RMD160 eb237e447eb846f5d7d9e1131a6a5133e53d750a ChangeLog 25785
+SHA256 7c3f6dc9cd7e4c6b94dd709b9f0121515587d03a1166ed78b6e6eb180ca3255d ChangeLog 25785
MISC metadata.xml 1460 RMD160 6f73dd6370c976b947d939633aa6f67d078e4fc7 SHA1 a29a6ed2d9dfbe3b686a9281a1909d9fc7bd61e9 SHA256 ad820b0fe2d8ec2aac1eb181f2e3e2769392e1ae6c5f6afb7e1603bdd0bb7405
MD5 e1753ef0eb3e9614fadff321ecd1b082 metadata.xml 1460
RMD160 6f73dd6370c976b947d939633aa6f67d078e4fc7 metadata.xml 1460
@@ -236,3 +239,10 @@ SHA256 43f814e2ff2cd9d7ca6f40f336a9eacefb8b3d2d0aa3fdd5046369a07aa00251 files/di
MD5 c36ac17ff6e664f9a8f5bd2fe3534dd5 files/digest-db-4.4.20_p2 660
RMD160 fa3804c13649e3d5d0bc42c5a7822764be74a674 files/digest-db-4.4.20_p2 660
SHA256 dcce09c08cdfddd585acc3b07685a92d1f78dad6ce7936b85728cf782b4c2096 files/digest-db-4.4.20_p2 660
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFExzJ81ZcsMnZjRyIRAp1kAJ9qciivU22RZZ1VCTGAN+gD1NoPzQCfYpt9
+QjMYeGstFU1gvMHs9CRAbjw=
+=fkhB
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/db/db-4.2.52_p4-r2.ebuild b/sys-libs/db/db-4.2.52_p4-r2.ebuild
index f3559c63d682..9c2d9e72a248 100644
--- a/sys-libs/db/db-4.2.52_p4-r2.ebuild
+++ b/sys-libs/db/db-4.2.52_p4-r2.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p4-r2.ebuild,v 1.1 2006/07/25 21:14:14 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p4-r2.ebuild,v 1.2 2006/07/26 09:11:38 azarah Exp $
inherit eutils gnuconfig db java-pkg-opt-2
#Number of official patches
#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
PATCHNO=${PV/*.*.*_p}
-if [ "${PATCHNO}" == "${PV}" ]; then
+if [[ ${PATCHNO} == "${PV}" ]] ; then
MY_PV=${PV}
MY_P=${P}
PATCHNO=0
@@ -16,11 +16,11 @@ else
MY_P=${PN}-${MY_PV}
fi
-S=${WORKDIR}/${MY_P}/build_unix
+S="${WORKDIR}/${MY_P}/build_unix"
DESCRIPTION="Berkeley DB"
HOMEPAGE="http://www.sleepycat.com/"
SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-for (( i=1 ; i<=$PATCHNO ; i++ )) ; do
+for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
export SRC_URI="${SRC_URI} http://www.sleepycat.com/update/${MY_PV}/patch.${MY_PV}.${i}"
done
@@ -35,23 +35,25 @@ RDEPEND="tcltk? ( dev-lang/tcl )
java? ( >=virtual/jre-1.4 )"
src_unpack() {
- unpack ${MY_P}.tar.gz
- cd ${WORKDIR}/${MY_P}
- for (( i=1 ; i<=$PATCHNO ; i++ ))
+ unpack "${MY_P}".tar.gz
+ cd "${WORKDIR}"/"${MY_P}"
+ for (( i=1 ; i<=${PATCHNO} ; i++ ))
do
- epatch ${DISTDIR}/patch.${MY_PV}.${i}
+ epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
done
- epatch ${FILESDIR}/${PN}-${SLOT}-libtool.patch
- epatch ${FILESDIR}/${PN}-4.0.14-fix-dep-link.patch
- epatch ${FILESDIR}/${PN}-4.2.52_p2-TXN.patch
+ epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch
+ epatch "${FILESDIR}"/"${PN}"-4.0.14-fix-dep-link.patch
+ epatch "${FILESDIR}"/"${PN}"-4.2.52_p2-TXN.patch
# use the includes from the prefix
- epatch ${FILESDIR}/${PN}-${SLOT}-jni-check-prefix-first.patch
- epatch ${FILESDIR}/${PN}-${SLOT}-listen-to-java-options.patch
+ epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-jni-check-prefix-first.patch
+ epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-listen-to-java-options.patch
- gnuconfig_update "${S}/../dist"
+ gnuconfig_update "${S}"/../dist
- sed -i -e "s,\(ac_compiler\|\${MAKEFILE_CC}\|\${MAKEFILE_CXX}\|\$CC\)\( *--version\),\1 -dumpversion,g" ${S}/../dist/configure
+ sed -i \
+ -e "s,\(ac_compiler\|\${MAKEFILE_CC}\|\${MAKEFILE_CXX}\|\$CC\)\( *--version\),\1 -dumpversion,g" \
+ "${S}"/../dist/configure
}
src_compile() {
@@ -91,11 +93,11 @@ src_compile() {
--datadir=/usr/share \
--sysconfdir=/etc \
--localstatedir=/var/lib \
- --libdir=/usr/$(get_libdir) \
+ --libdir=/usr/"$(get_libdir)" \
--enable-compat185 \
--with-uniquename \
--enable-rpc \
- --host=${CHOST} \
+ --host="${CHOST}" \
${myconf} "${javaconf}" || die "configure failed"
emake -j1 || die "make failed"
@@ -114,12 +116,12 @@ src_install() {
db_src_install_usrlibcleanup
dodir /usr/sbin
- mv ${D}/usr/bin/berkeley_db_svc ${D}/usr/sbin/berkeley_db42_svc
+ mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db42_svc
if use java; then
- java-pkg_regso ${D}/usr/lib/libdb_java*.so
- java-pkg_dojar ${D}/usr/lib/*.jar
- rm ${D}/usr/lib/*.jar
+ java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so
+ java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar
+ rm -f "${D}"/usr/"$(get_libdir)"/*.jar
fi
}
diff --git a/sys-libs/db/db-4.3.29-r2.ebuild b/sys-libs/db/db-4.3.29-r2.ebuild
index c50caba30e19..76eaa44b2f1e 100644
--- a/sys-libs/db/db-4.3.29-r2.ebuild
+++ b/sys-libs/db/db-4.3.29-r2.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.3.29-r2.ebuild,v 1.1 2006/07/25 21:14:14 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.3.29-r2.ebuild,v 1.2 2006/07/26 09:11:38 azarah Exp $
inherit eutils gnuconfig db flag-o-matic java-pkg-opt-2
#Number of official patches
#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
PATCHNO=${PV/*.*.*_p}
-if [ "${PATCHNO}" == "${PV}" ]; then
+if [[ ${PATCHNO} == "${PV}" ]] ; then
MY_PV=${PV}
MY_P=${P}
PATCHNO=0
@@ -16,12 +16,12 @@ else
MY_P=${PN}-${MY_PV}
fi
-S=${WORKDIR}/${MY_P}/build_unix
+S="${WORKDIR}/${MY_P}/build_unix"
DESCRIPTION="Berkeley DB"
HOMEPAGE="http://www.sleepycat.com/"
SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
#SRC_URI="ftp://ftp.sleepycat.com/releases/${MY_P}.tar.gz"
-for (( i=1 ; i<=$PATCHNO ; i++ )) ; do
+for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
export SRC_URI="${SRC_URI} http://www.sleepycat.com/update/${MY_PV}/patch.${MY_PV}.${i}"
done
@@ -37,23 +37,25 @@ RDEPEND="tcltk? ( dev-lang/tcl )
java? ( >=virtual/jre-1.4 )"
src_unpack() {
- unpack ${MY_P}.tar.gz
- cd ${WORKDIR}/${MY_P}
- for (( i=1 ; i<=$PATCHNO ; i++ ))
+ unpack "${MY_P}".tar.gz
+ cd "${WORKDIR}"/"${MY_P}"
+ for (( i=1 ; i<=${PATCHNO} ; i++ ))
do
- epatch ${DISTDIR}/patch.${MY_PV}.${i}
+ epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
done
- epatch ${FILESDIR}/${PN}-${SLOT}-libtool.patch
+ epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch
- epatch ${FILESDIR}/${PN}-4.3.27-fix-dep-link.patch
+ epatch "${FILESDIR}"/"${PN}"-4.3.27-fix-dep-link.patch
# use the includes from the prefix
- epatch ${FILESDIR}/${PN}-${SLOT}-jni-check-prefix-first.patch
- epatch ${FILESDIR}/${PN}-${SLOT}-listen-to-java-options.patch
+ epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-jni-check-prefix-first.patch
+ epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-listen-to-java-options.patch
- gnuconfig_update "${S}/../dist"
+ gnuconfig_update "${S}"/../dist
- sed -i -e "s,\(ac_compiler\|\${MAKEFILE_CC}\|\${MAKEFILE_CXX}\|\$CC\)\( *--version\),\1 -dumpversion,g" ${S}/../dist/configure
+ sed -i \
+ -e "s,\(ac_compiler\|\${MAKEFILE_CC}\|\${MAKEFILE_CXX}\|\$CC\)\( *--version\),\1 -dumpversion,g" \
+ "${S}"/../dist/configure
}
src_compile() {
@@ -99,11 +101,11 @@ src_compile() {
--datadir=/usr/share \
--sysconfdir=/etc \
--localstatedir=/var/lib \
- --libdir=/usr/$(get_libdir) \
+ --libdir=/usr/"$(get_libdir)" \
--enable-compat185 \
--without-uniquename \
--enable-rpc \
- --host=${CHOST} \
+ --host="${CHOST}" \
${myconf} "${javaconf}" || die "configure failed"
emake -j1 || die "make failed"
@@ -121,12 +123,12 @@ src_install() {
db_src_install_usrlibcleanup
dodir /usr/sbin
- mv ${D}/usr/bin/berkeley_db_svc ${D}/usr/sbin/berkeley_db43_svc
+ mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db43_svc
if use java; then
- java-pkg_regso ${D}/usr/lib/libdb_java*.so
- java-pkg_dojar ${D}/usr/lib/*.jar
- rm ${D}/usr/lib/*.jar
+ java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so
+ java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar
+ rm -f "${D}"/usr/"$(get_libdir)"/*.jar
fi
}