summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2010-09-12 08:48:18 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2010-09-12 08:48:18 +0000
commitf644c2556ba51e75a06b7e360f3f6eea165b0b57 (patch)
treedabd659eced988f97051805536814111665e42df /sys-libs/db
parentAdd ree18. (diff)
downloadhistorical-f644c2556ba51e75a06b7e360f3f6eea165b0b57.tar.gz
historical-f644c2556ba51e75a06b7e360f3f6eea165b0b57.tar.bz2
historical-f644c2556ba51e75a06b7e360f3f6eea165b0b57.zip
Bug #160192: Trim old gnuconfig_update versions.
Package-Manager: portage-2.2_rc75/cvs/Linux x86_64
Diffstat (limited to 'sys-libs/db')
-rw-r--r--sys-libs/db/ChangeLog7
-rw-r--r--sys-libs/db/Manifest7
-rw-r--r--sys-libs/db/db-3.2.9-r11.ebuild163
-rw-r--r--sys-libs/db/db-4.2.52_p4-r2.ebuild133
-rw-r--r--sys-libs/db/db-4.3.29-r2.ebuild141
-rw-r--r--sys-libs/db/files/patch.3.2.9.1104
-rw-r--r--sys-libs/db/files/patch.3.2.9.221
7 files changed, 7 insertions, 569 deletions
diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 169a74bb1f61..659ac03fa2c5 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-libs/db
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.310 2010/08/01 21:47:48 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.311 2010/09/12 08:48:18 robbat2 Exp $
+
+ 12 Sep 2010; Robin H. Johnson <robbat2@gentoo.org> -db-3.2.9-r11.ebuild,
+ -db-4.2.52_p4-r2.ebuild, -db-4.3.29-r2.ebuild, -files/patch.3.2.9.1,
+ -files/patch.3.2.9.2:
+ Bug #160192: Trim old gnuconfig_update versions.
01 Aug 2010; Markos Chandras <hwoarang@gentoo.org> db-4.8.30.ebuild:
Stable on amd64 wrt bug #328609
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 2798f54dad46..9ca158273386 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -25,8 +25,6 @@ AUX db-4.6-libtool.patch 1817 RMD160 989536933036b8ea7d4bf55420c49ebad76d703b SH
AUX db-4.8-libtool.patch 2076 RMD160 e92a09df1944c5054220c3467c4d3fe558928575 SHA1 af4faf7c990ad85dea0c3e651c8b7a0d0be7078d SHA256 b337c02ffc540e2d692ec57fe093d182f0054a673e5267eabd2db24121486312
AUX db-4.8.24-java-manifest-location.patch 592 RMD160 8822d3b058f542414b46cdc63e7074ddb8a4a845 SHA1 12f7d6d56d180628d53fc00046f1c2a23b7fd67c SHA256 1589885b89ff465fe752c3062e322638a39ccf1a96c392473c5424cfcc628aea
AUX db-5.0.21-enable-dbm-autoconf.patch 1757 RMD160 db8cafeda220734e2436bbd2ff51850e291a7160 SHA1 6c82c0b1c9fbfb492349795d9263ac8cc26cad26 SHA256 e4868b2cbdfc881d9822d354e873727bbd824c3aa09c60dd6d6d8102c2bc1323
-AUX patch.3.2.9.1 2139 RMD160 a018e1e91102c972279ec017e1d87d6d87f99a56 SHA1 34108ae9ce03c40c4d1016e9e54690d5d8fc4135 SHA256 6d89a42ee0be9e47b3e8a42981c65266a556de84bc6281edcf0f977f52547798
-AUX patch.3.2.9.2 495 RMD160 c9982844d99e1c78efddcb7b7615c41f6225e6b9 SHA1 c447c089f44c401c174244a7f9f7967522ba92a4 SHA256 61db874796fe8789b0045f456285b27c5b8b7b8902a5e342a115456015716d0e
DIST db-1.85-r3.1.patch.bz2 14641 RMD160 463c9d6cf013b28ff2c364d3f2ced378b334fea3 SHA1 95d36410f0fee98f192eee04c2a1f74cac106270 SHA256 88e3095b191fe425d0192d052595ab838ad4ef6324aac0a9e338fd6df7ae40d4
DIST db-3.2.9.tar.gz 2085238 RMD160 c2c5cdb3ec0e99e5687c0861dfbf76b8878f27cb SHA1 1adcc34b6a56e51e4019e80bc56b509ac28e1035 SHA256 3eccaec87bca4ca0f5728cf4579650da9d12e331187f1e98321e5c9e9e04b108
DIST db-4.2.52.tar.gz 4073147 RMD160 d9095bce12b519695f3d1ff708dc0d1babd7a4b2 SHA1 12d21a58efd7b5fd35b56815a8fb1ac2cbab2e5c SHA256 72f581d8b91da900434629886d1d1c6ea8b9d2a9329368c3b875e7cd556b6a0e
@@ -64,12 +62,9 @@ DIST patch.4.7.25.2 2210 RMD160 097a6bc3e8efd43fe5bd0fd77a4b793cd0d6bc18 SHA1 e3
DIST patch.4.7.25.3 8442 RMD160 a0ef673d8127be825444aaa12711dcf75b7fda1a SHA1 1f707e6c65c8ebe9fa7b36333c6de76f2d480cf5 SHA256 e5393cbfc8538cc21cc939d26ceca3e5782b4a4259a644884d91790e18ed39f3
DIST patch.4.7.25.4 5647 RMD160 0b235122060785887eb41fa7657379bd4f1e57bf SHA1 0eb5566ad2ca2232b92d8c71285bfaf32aba54dc SHA256 f55ea01a7905f8439d617717892e03d026c0ac34434c8fa16798fec75e5ba798
EBUILD db-1.85-r3.ebuild 1380 RMD160 5f83a60a3e196d9988af40a0e1a5c1b4781f81ca SHA1 07998d65f70d2ff4703f7f87cb73f6b35f545b19 SHA256 2547f9e976def8144f3ce8ab21c396b6555bc98193bef3ab54656e2b829ab994
-EBUILD db-3.2.9-r11.ebuild 4409 RMD160 563951cb50a8d1895b04f97aa547679b62b50fdd SHA1 7a2105f0dcb63bbefbf242887b377e66594055b5 SHA256 c4a4071e3f8466bd1928687dd858b862952ee4e112efc9b14660078a71e85da2
EBUILD db-3.2.9_p2.ebuild 4917 RMD160 75ddd6c2dd9a96a9b26624dbba2956ace3fdf9d3 SHA1 819d16049c401c07659e36a55b0fd63f7677ba6e SHA256 393eb303c48c757df6ddd80aaefee10c4d08c0cbe4dfaa969b1f4118af0c1da9
-EBUILD db-4.2.52_p4-r2.ebuild 3521 RMD160 77ad9588ffd789749991d256007905b81beb89f0 SHA1 50a335a481f4c1460e3fc5588c718cdccbde3d01 SHA256 2ab0cdb42945b201159166b42f6f43f985372c3fa5c58a8d2c698d864b45d7bf
EBUILD db-4.2.52_p5-r1.ebuild 4967 RMD160 965f1c0634d6283a89ba387636321096e010fe82 SHA1 f6538f9dc37bb9f6c07350f99c78bd096339a32d SHA256 2a52dbfde95da704237caeee30ee622ae7084be0144cc3faa161718c304030a4
EBUILD db-4.2.52_p5.ebuild 3634 RMD160 271b1a67cb7421a446366b690a612137a597cc96 SHA1 958ad6327ceb8dcbeea155a6080286d590ab72a7 SHA256 96ff59badf4f54513430383f7611d9cdf564f3e7170e178227673b5eb6ed5059
-EBUILD db-4.3.29-r2.ebuild 3747 RMD160 2d0a38bf4dd571b4c40e2045e5145e170bf3f95e SHA1 597d8fab390df03152fc5cf04b08ec829bab0083 SHA256 06ba8c4284bdf1415ca5315c561eb2822e498bc362c6e9de75407720c3394ede
EBUILD db-4.3.29_p1-r1.ebuild 4926 RMD160 39a85a8d06d197542d15c2fc7e1b8f0746cd645e SHA1 30a4c224b2e760d517c40e60d210f63511a81c0a SHA256 84c2159bbf0968f72ebc2aedfb7044aa71c51938bf31de9ba06ecf5688435d44
EBUILD db-4.3.29_p1.ebuild 3804 RMD160 2b171030d3158631018d3275104ae6f703633ff8 SHA1 270b4136936e7c524cf474926e20aa9c823b6204 SHA256 f8073fb1f2d95be50d035aad0b4858297e668c7d23f1fbacdc1e156345861a2a
EBUILD db-4.4.20_p4-r1.ebuild 4810 RMD160 ad4e315751b6fa78a81d65775d3469d5ca3cd3f5 SHA1 869d3eb18f238ef3ddd92c6f820278390fefd5ff SHA256 0314a42e233a5b69b7afdfc2566ffef8755a8bc0a03901f648afb3416d9fb703
@@ -83,5 +78,5 @@ EBUILD db-4.8.24.ebuild 4431 RMD160 3ed6aa7cd48f9824bdf8b2cb4f44b5fc48fe887c SHA
EBUILD db-4.8.26.ebuild 4431 RMD160 b5ada7784ee0ff0ecff7bcbd10a72a64abb6271c SHA1 c884f625ead196b4e1afaf428cf394b8008ef4a4 SHA256 ba81971dc4090bc318cdfa6ec02e5dad68693b038a5fa03827f83e677089e5fd
EBUILD db-4.8.30.ebuild 4430 RMD160 0b0e66d53d3fd0307dee10fec9d7205663d12062 SHA1 cbd56d479531e7379702ba7a3e833e12ff7651bb SHA256 f580e50b1d09218fc0c2e3a00802c10ffad1488090f56d92be27bdab1b21981b
EBUILD db-5.0.21-r1.ebuild 5366 RMD160 473e53358830d7cb37391c98549144df8cd56078 SHA1 89d7a01c4de83e3d14fa08ed81fc714dcd5c37a9 SHA256 6f6e8371ba59d3593592f468e66d83b6e1b737eac1a624445f1c3cba8eb0072a
-MISC ChangeLog 48588 RMD160 571ae8256c1bee89069b7acde04c4f9510d3e736 SHA1 a4fa639de5e250102d6075d6ce1b4900d87fc0e2 SHA256 4a5bf37920fd1ad97e64197891ff4e06be537d3337c91134ebb243603df31572
+MISC ChangeLog 48809 RMD160 b3ec0af2a341769d5b78b7f84b5787748fbcccc6 SHA1 30743a2f367e6877b882bfa8b324237b71252ff5 SHA256 b435518f1074f575fbb75ccd346c40f8546c227cb0a06ca62ff9f8d05181a04b
MISC metadata.xml 1463 RMD160 8e4cb5bc76931b83b9b1e8d4cbe719224fda40f3 SHA1 0120fead11c4452b41738edb1456cfa1edc31a05 SHA256 c6d35d6a2053996f868d12532f33d943e28c9ee27df5b61c83c2836f77cdb34c
diff --git a/sys-libs/db/db-3.2.9-r11.ebuild b/sys-libs/db/db-3.2.9-r11.ebuild
deleted file mode 100644
index 5bf7ee08c1dc..000000000000
--- a/sys-libs/db/db-3.2.9-r11.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-3.2.9-r11.ebuild,v 1.19 2009/10/13 13:53:47 ssuominen Exp $
-
-inherit gnuconfig libtool eutils db
-
-DESCRIPTION="Berkeley DB for transaction support in MySQL"
-HOMEPAGE="http://www.sleepycat.com/"
-SRC_URI="ftp://ftp.sleepycat.com/releases/${P}.tar.gz"
-
-LICENSE="DB"
-SLOT="3"
-# This ebuild is to be the compatibility ebuild for when db4 is put
-# in the tree.
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="doc"
-
-DEPEND="${RDEPEND}
- =sys-libs/db-1.85*
- sys-devel/libtool
- sys-devel/m4"
-# We need m4 too else build fails without config.guess
-
-# This doesn't build without exceptions
-export CXXFLAGS="${CXXFLAGS/-fno-exceptions/-fexceptions}"
-
-src_unpack() {
- unpack ${A}
-
- chmod -R ug+w *
-
- cd "${WORKDIR}"/${P}
- epatch "${FILESDIR}"/patch.3.2.9.1
- epatch "${FILESDIR}"/patch.3.2.9.2
-
- # Get db to link libdb* to correct dependencies ... for example if we use
- # NPTL or NGPT, db detects usable mutexes, and should link against
- # libpthread, but does not do so ...
- # <azarah@gentoo.org> (23 Feb 2003)
- epatch "${FILESDIR}"/${P}-fix-dep-link.patch
-
- # We should get dump185 to link against system db1 ..
- # <azarah@gentoo.org> (23 Feb 2003)
- mv "${S}"/dist/Makefile.in "${S}"/dist/Makefile.in.orig
- sed -e 's:DB185INC=:DB185INC= -I/usr/include/db1:' \
- -e 's:DB185LIB=:DB185LIB= -ldb1:' \
- "${S}"/dist/Makefile.in.orig > "${S}"/dist/Makefile.in || die "Failed to sed"
-
- # Fix invalid .la files
- cd "${WORKDIR}"/${P}/dist
- rm -f ltversion.sh
- # remove config.guess else we have problems with gcc-3.2
- rm -f config.guess
- sed -i "s,\(-D_GNU_SOURCE\),\1 ${CFLAGS}," configure
-
- cd "${S}"
- gnuconfig_update
-}
-
-src_compile() {
- local conf=
- local conf_shared=
- local conf_static=
-
- conf="${conf}
- --host=${CHOST} \
- --build=${CHOST} \
- --enable-cxx \
- --enable-compat185 \
- --enable-dump185 \
- --prefix=/usr"
-
- # --enable-rpc DOES NOT BUILD
- # Robin H. Johnson <robbat2@gentoo.org> (18 Oct 2003)
-
- conf_shared="${conf_shared}
- --enable-dynamic"
-
- # TCL support is also broken
- # Robin H. Johnson <robbat2@gentoo.org> (18 Oct 2003)
- # conf_shared="${conf_shared}
- # `use_enable tcl tcl`
- # `use_with tcl tcl /usr/$(get_libdir)`"
-
- # NOTE: we should not build both shared and static versions
- # of the libraries in the same build root!
-
- einfo "Configuring ${P} (static)..."
- mkdir -p "${S}"/build-static
- cd "${S}"/build-static
- strip=/bin/true \
- ../dist/configure ${conf} ${conf_static} \
- --libdir=/usr/$(get_libdir) \
- --enable-static || die
-
- einfo "Configuring ${P} (shared)..."
- mkdir -p "${S}"/build-shared
- cd "${S}"/build-shared
- strip=/bin/true \
- ../dist/configure ${conf} ${conf_shared} \
- --libdir=/usr/$(get_libdir) \
- --enable-shared || die
-
- # Parallel make does not work
- MAKEOPTS="${MAKEOPTS} -j1"
- einfo "Building ${P} (static)..."
- cd "${S}"/build-static
- emake strip=/bin/true || die "Static build failed"
- einfo "Building ${P} (shared)..."
- cd "${S}"/build-shared
- emake strip=/bin/true || die "Shared build failed"
-}
-
-src_install () {
- cd "${S}"/build-shared
- make libdb=libdb-3.2.a \
- libcxx=libcxx_3.2.a \
- prefix="${D}"/usr \
- libdir="${D}"/usr/$(get_libdir) \
- strip=/bin/true \
- install || die
-
- cd "${S}"/build-static
- newlib.a libdb.a libdb-3.2.a || die "failed to package static libraries!"
- newlib.a libdb_cxx.a libdb_cxx-3.2.a || die "failed to package static libraries!"
-
- db_src_install_headerslot || die "db_src_install_headerslot failed!"
-
- # this is now done in the db eclass, function db_fix_so and db_src_install_usrlibcleanup
- #cd "${D}"/usr/lib
- #ln -s libdb-3.2.so libdb.so.3
-
- # For some reason, db.so's are *not* readable by group or others,
- # resulting in no one but root being able to use them!!!
- # This fixes it -- DR 15 Jun 2001
- cd "${D}"/usr/$(get_libdir)
- chmod go+rx *.so
- # The .la's aren't readable either
- chmod go+r *.la
-
- cd "${S}"
- dodoc README
-
- db_src_install_doc || die "db_src_install_doc failed!"
-
- db_src_install_usrbinslot || die "db_src_install_usrbinslot failed!"
-
- db_src_install_usrlibcleanup || die "db_src_install_usrlibcleanup failed!"
-}
-
-pkg_postinst () {
- db_fix_so
-}
-
-pkg_postrm () {
- db_fix_so
-}
-
-src_test() {
- if use test; then
- eerror "We'd love to be able to test, but the testsuite is broken in the 3.2.9 series"
- fi
-}
diff --git a/sys-libs/db/db-4.2.52_p4-r2.ebuild b/sys-libs/db/db-4.2.52_p4-r2.ebuild
deleted file mode 100644
index d1d8211c0e5f..000000000000
--- a/sys-libs/db/db-4.2.52_p4-r2.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2009 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.18 2009/09/20 19:52:44 robbat2 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
- MY_PV=${PV}
- MY_P=${P}
- PATCHNO=0
-else
- MY_PV=${PV/_p${PATCHNO}}
- MY_P=${PN}-${MY_PV}
-fi
-
-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
- export SRC_URI="${SRC_URI} http://www.sleepycat.com/update/${MY_PV}/patch.${MY_PV}.${i}"
-done
-
-LICENSE="DB"
-SLOT="4.2"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="tcl java doc nocxx"
-
-DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
- java? ( >=virtual/jdk-1.4 )"
-RDEPEND="tcl? ( 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++ ))
- do
- 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
-
- # use the includes from the prefix
- epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-jni-check-prefix-first.patch
- epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-listen-to-java-options.patch
-
- gnuconfig_update "${S}"/../dist
-
- sed -i \
- -e "s,\(ac_compiler\|\${MAKEFILE_CC}\|\${MAKEFILE_CXX}\|\$CC\)\( *--version\),\1 -dumpversion,g" \
- "${S}"/../dist/configure
-}
-
-src_compile() {
- local myconf=""
-
- use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
-
- myconf="${myconf} $(use_enable !nocxx cxx)"
-
- use tcl \
- && myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
- || myconf="${myconf} --disable-tcl"
-
- myconf="${myconf} $(use_enable java)"
- if use java; then
- myconf="${myconf} --with-java-prefix=${JAVA_HOME}"
- # Can't get this working any other way, since it returns spaces, and
- # bash doesn't seem to want to pass correctly in any way i try
- local javaconf="-with-javac-flags=$(java-pkg_javac-args)"
- fi
-
- [[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
-
- # the entire testsuite needs the TCL functionality
- if use tcl && use test; then
- myconf="${myconf} --enable-test"
- else
- myconf="${myconf} --disable-test"
- fi
-
- ../dist/configure \
- --prefix=/usr \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --datadir=/usr/share \
- --sysconfdir=/etc \
- --localstatedir=/var/lib \
- --libdir=/usr/"$(get_libdir)" \
- --enable-compat185 \
- --with-uniquename \
- --enable-rpc \
- --host="${CHOST}" \
- ${myconf} "${javaconf}" || die "configure failed"
-
- emake -j1 || die "make failed"
-}
-
-src_install() {
- einstall libdir="${D}/usr/$(get_libdir)" strip="${D}/bin/strip" || die
-
- db_src_install_usrbinslot
-
- db_src_install_headerslot
-
- db_src_install_doc
-
- db_src_install_usrlibcleanup
-
- dodir /usr/sbin
- # This file is not always built, and no longer exists as of db-4.8
- [[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \
- mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db42_svc
-
- if use java; then
- 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
-}
-
-pkg_postinst() {
- db_fix_so
-}
-
-pkg_postrm() {
- db_fix_so
-}
diff --git a/sys-libs/db/db-4.3.29-r2.ebuild b/sys-libs/db/db-4.3.29-r2.ebuild
deleted file mode 100644
index 508577d649c4..000000000000
--- a/sys-libs/db/db-4.3.29-r2.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2009 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.22 2009/09/20 19:52:44 robbat2 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
- MY_PV=${PV}
- MY_P=${P}
- PATCHNO=0
-else
- MY_PV=${PV/_p${PATCHNO}}
- MY_P=${PN}-${MY_PV}
-fi
-
-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
- export SRC_URI="${SRC_URI} http://www.sleepycat.com/update/${MY_PV}/patch.${MY_PV}.${i}"
-done
-
-LICENSE="DB"
-SLOT="4.3"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="tcl java doc nocxx"
-
-DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
- java? ( >=virtual/jdk-1.4 )
- >=sys-devel/binutils-2.16.1"
-RDEPEND="tcl? ( 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++ ))
- do
- epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
- done
- epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.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
-
- gnuconfig_update "${S}"/../dist
-
- sed -i \
- -e "s,\(ac_compiler\|\${MAKEFILE_CC}\|\${MAKEFILE_CXX}\|\$CC\)\( *--version\),\1 -dumpversion,g" \
- "${S}"/../dist/configure
-}
-
-src_compile() {
- local myconf=""
-
- use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
-
- myconf="${myconf} $(use_enable !nocxx cxx)"
-
- use tcl \
- && myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
- || myconf="${myconf} --disable-tcl"
-
- myconf="${myconf} $(use_enable java)"
- if use java; then
- myconf="${myconf} --with-java-prefix=${JAVA_HOME}"
- # Can't get this working any other way, since it returns spaces, and
- # bash doesn't seem to want to pass correctly in any way i try
- local javaconf="-with-javac-flags=$(java-pkg_javac-args)"
- fi
-
- [[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
-
- # the entire testsuite needs the TCL functionality
- if use tcl && use test ; then
- myconf="${myconf} --enable-test"
- else
- myconf="${myconf} --disable-test"
- fi
-
- # Add linker versions to the symbols. Easier to do, and safer than header
- # file mumbo jumbo.
- if use userland_GNU; then
- append-ldflags -Wl,--default-symver
- fi
-
- ../dist/configure \
- --prefix=/usr \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --datadir=/usr/share \
- --sysconfdir=/etc \
- --localstatedir=/var/lib \
- --libdir=/usr/"$(get_libdir)" \
- --enable-compat185 \
- --without-uniquename \
- --enable-rpc \
- --host="${CHOST}" \
- ${myconf} "${javaconf}" || die "configure failed"
-
- emake -j1 || die "make failed"
-}
-
-src_install() {
- einstall libdir="${D}/usr/$(get_libdir)" strip="${D}/bin/strip" || die
-
- db_src_install_usrbinslot
-
- db_src_install_headerslot
-
- db_src_install_doc
-
- db_src_install_usrlibcleanup
-
- dodir /usr/sbin
- # This file is not always built, and no longer exists as of db-4.8
- [[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \
- mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db43_svc
-
- if use java; then
- 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
-}
-
-pkg_postinst() {
- db_fix_so
-}
-
-pkg_postrm() {
- db_fix_so
-}
diff --git a/sys-libs/db/files/patch.3.2.9.1 b/sys-libs/db/files/patch.3.2.9.1
deleted file mode 100644
index 8d70c6e51917..000000000000
--- a/sys-libs/db/files/patch.3.2.9.1
+++ /dev/null
@@ -1,104 +0,0 @@
-*** include/log.h.orig 2001/01/25 18:22:51 11.20
---- include/log.h 2001/02/06 05:02:28 11.21
-***************
-*** 198,203 ****
---- 198,204 ----
- */
- typedef enum {
- DB_LV_INCOMPLETE,
-+ DB_LV_NONEXISTENT,
- DB_LV_NORMAL,
- DB_LV_OLD_READABLE,
- DB_LV_OLD_UNREADABLE
-*** log/log.c.orig 2001/01/25 18:22:55 11.43
---- log/log.c 2001/02/06 05:02:28 11.44
-***************
-*** 309,321 ****
- int find_first, *valp;
- logfile_validity *statusp;
- {
-! logfile_validity clv_status, status;
- u_int32_t clv, logval;
- int cnt, fcnt, ret;
- const char *dir;
- char **names, *p, *q, savech;
-
-! clv_status = status = DB_LV_NORMAL;
-
- /* Return a value of 0 as the log file number on failure. */
- *valp = 0;
---- 309,321 ----
- int find_first, *valp;
- logfile_validity *statusp;
- {
-! logfile_validity logval_status, status;
- u_int32_t clv, logval;
- int cnt, fcnt, ret;
- const char *dir;
- char **names, *p, *q, savech;
-
-! logval_status = status = DB_LV_NONEXISTENT;
-
- /* Return a value of 0 as the log file number on failure. */
- *valp = 0;
-***************
-*** 385,394 ****
- * as a valid log file.
- */
- break;
- case DB_LV_NORMAL:
- case DB_LV_OLD_READABLE:
- logval = clv;
-! clv_status = status;
- break;
- case DB_LV_OLD_UNREADABLE:
- /*
---- 385,398 ----
- * as a valid log file.
- */
- break;
-+ case DB_LV_NONEXISTENT:
-+ /* Should never happen. */
-+ DB_ASSERT(0);
-+ break;
- case DB_LV_NORMAL:
- case DB_LV_OLD_READABLE:
- logval = clv;
-! logval_status = status;
- break;
- case DB_LV_OLD_UNREADABLE:
- /*
-***************
-*** 410,416 ****
- */
- if (!find_first) {
- logval = clv;
-! clv_status = status;
- }
- break;
- }
---- 414,420 ----
- */
- if (!find_first) {
- logval = clv;
-! logval_status = status;
- }
- break;
- }
-***************
-*** 420,426 ****
-
- err: __os_dirfree(names, fcnt);
- __os_freestr(p);
-! *statusp = clv_status;
-
- return (ret);
- }
---- 424,430 ----
-
- err: __os_dirfree(names, fcnt);
- __os_freestr(p);
-! *statusp = logval_status;
-
- return (ret);
- }
diff --git a/sys-libs/db/files/patch.3.2.9.2 b/sys-libs/db/files/patch.3.2.9.2
deleted file mode 100644
index 4092cda52eac..000000000000
--- a/sys-libs/db/files/patch.3.2.9.2
+++ /dev/null
@@ -1,21 +0,0 @@
-*** log/log_rec.c.orig 2001/01/25 18:22:56 11.49
---- log/log_rec.c 2001/02/07 22:17:46
-***************
-*** 404,410 ****
- TAILQ_INIT(&logp->dbentry[i].dblist);
- else
- TAILQ_REINSERT_HEAD(
-! &logp->dbentry[i].dblist, dbp, links);
- }
-
- /* Initialize the new entries. */
---- 404,410 ----
- TAILQ_INIT(&logp->dbentry[i].dblist);
- else
- TAILQ_REINSERT_HEAD(
-! &logp->dbentry[i].dblist, dbtmp, links);
- }
-
- /* Initialize the new entries. */
-
-