From 35649ba689623e24501e7091b13eb8ba8d60fc84 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Thu, 7 Nov 2019 18:35:02 +0100 Subject: sys-libs/db: First batch of EAPI-7 revbumps Bug: https://bugs.gentoo.org/697542 Closes: https://bugs.gentoo.org/612686 Closes: https://bugs.gentoo.org/639754 Closes: https://bugs.gentoo.org/603680 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Lars Wendler --- sys-libs/db/db-1.85-r3.ebuild | 52 ------ sys-libs/db/db-1.85-r4.ebuild | 56 ++++++ sys-libs/db/db-3.2.9_p2-r1.ebuild | 197 +++++++++++++++++++++ sys-libs/db/db-3.2.9_p2.ebuild | 184 ------------------- sys-libs/db/db-4.2.52_p5-r1.ebuild | 167 ----------------- sys-libs/db/db-4.2.52_p5-r2.ebuild | 193 ++++++++++++++++++++ sys-libs/db/db-4.3.29_p1-r1.ebuild | 170 ------------------ sys-libs/db/db-4.3.29_p1-r2.ebuild | 192 ++++++++++++++++++++ sys-libs/db/db-4.4.20_p4-r1.ebuild | 164 ----------------- sys-libs/db/db-4.4.20_p4-r2.ebuild | 186 +++++++++++++++++++ sys-libs/db/files/db-1.85-gentoo-paths.patch | 4 +- sys-libs/db/files/db-3.2.9-gcc43.patch | 2 +- .../db/files/db-4.2-jni-check-prefix-first.patch | 4 +- .../db/files/db-4.2-listen-to-java-options.patch | 4 +- sys-libs/db/files/db-4.2.52_p2-TXN.patch | 8 +- .../db/files/db-4.3-jni-check-prefix-first.patch | 4 +- sys-libs/db/files/db-4.3-libtool.patch | 4 +- sys-libs/db/files/db-4.4-libtool.patch | 4 +- 18 files changed, 841 insertions(+), 754 deletions(-) delete mode 100644 sys-libs/db/db-1.85-r3.ebuild create mode 100644 sys-libs/db/db-1.85-r4.ebuild create mode 100644 sys-libs/db/db-3.2.9_p2-r1.ebuild delete mode 100644 sys-libs/db/db-3.2.9_p2.ebuild delete mode 100644 sys-libs/db/db-4.2.52_p5-r1.ebuild create mode 100644 sys-libs/db/db-4.2.52_p5-r2.ebuild delete mode 100644 sys-libs/db/db-4.3.29_p1-r1.ebuild create mode 100644 sys-libs/db/db-4.3.29_p1-r2.ebuild delete mode 100644 sys-libs/db/db-4.4.20_p4-r1.ebuild create mode 100644 sys-libs/db/db-4.4.20_p4-r2.ebuild (limited to 'sys-libs') diff --git a/sys-libs/db/db-1.85-r3.ebuild b/sys-libs/db/db-1.85-r3.ebuild deleted file mode 100644 index 065baf18bbdd..000000000000 --- a/sys-libs/db/db-1.85-r3.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=0 - -inherit eutils toolchain-funcs multilib multilib - -DESCRIPTION="old berk db kept around for really old packages" -HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" -SRC_URI="http://download.oracle.com/berkeley-db/db.${PV}.tar.gz - mirror://gentoo/${PF}.1.patch.bz2" -# The patch used by Gentoo is from Fedora, and includes all 5 patches found on -# the Oracle page, plus others. - -LICENSE="Sleepycat" -SLOT="1" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -IUSE="" - -DEPEND="" - -S=${WORKDIR}/db.${PV} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${WORKDIR}"/${PF}.1.patch - epatch "${FILESDIR}"/${P}-gentoo-paths.patch - sed -i \ - -e "s:@GENTOO_LIBDIR@:$(get_libdir):" \ - PORT/linux/Makefile || die -} - -src_compile() { - tc-export CC AR RANLIB - emake -C PORT/linux OORG="${CFLAGS}" || die -} - -src_install() { - make -C PORT/linux install DESTDIR="${ED}" || die - - # binary compat symlink - dosym libdb1.so.2 /usr/$(get_libdir)/libdb.so.2 || die - - dosed "s:::" /usr/include/db1/ndbm.h - dosym db1/ndbm.h /usr/include/ndbm.h - - dodoc changelog README - newdoc hash/README README.hash - docinto ps - dodoc docs/*.ps -} diff --git a/sys-libs/db/db-1.85-r4.ebuild b/sys-libs/db/db-1.85-r4.ebuild new file mode 100644 index 000000000000..055296208c6a --- /dev/null +++ b/sys-libs/db/db-1.85-r4.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs multilib + +DESCRIPTION="old berk db kept around for really old packages" +HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" +SRC_URI="http://download.oracle.com/berkeley-db/db.${PV}.tar.gz + mirror://gentoo/${P}-r3.1.patch.bz2" +# The patch used by Gentoo is from Fedora, and includes all 5 patches found on +# the Oracle page, plus others. + +LICENSE="Sleepycat" +SLOT="1" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" +IUSE="" + +DEPEND="" + +S="${WORKDIR}/db.${PV}" + +PATCHES=( + "${WORKDIR}"/${P}-r3.1.patch + "${FILESDIR}"/${P}-gentoo-paths.patch +) + +src_prepare() { + default + + sed -i \ + -e "s:@GENTOO_LIBDIR@:$(get_libdir):" \ + PORT/linux/Makefile || die +} + +src_compile() { + tc-export CC AR RANLIB + emake -C PORT/linux OORG="${CFLAGS}" +} + +src_install() { + make -C PORT/linux install DESTDIR="${ED}" || die + + # binary compat symlink + dosym libdb1.so.2 /usr/$(get_libdir)/libdb.so.2 + + sed -e "s:::" \ + -i "${ED}"/usr/include/db1/ndbm.h || die + dosym db1/ndbm.h /usr/include/ndbm.h + + dodoc changelog README + newdoc hash/README README.hash + docinto ps + dodoc docs/*.ps +} diff --git a/sys-libs/db/db-3.2.9_p2-r1.ebuild b/sys-libs/db/db-3.2.9_p2-r1.ebuild new file mode 100644 index 000000000000..39694fde8a7d --- /dev/null +++ b/sys-libs/db/db-3.2.9_p2-r1.ebuild @@ -0,0 +1,197 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit db flag-o-matic multilib + +#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 + +DESCRIPTION="Berkeley DB for transaction support in MySQL" +HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" +SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz" +for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do + export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" +done + +LICENSE="Sleepycat" +SLOT="3" +# This ebuild is to be the compatibility ebuild for when db4 is put +# in the tree. +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" +IUSE="doc" + +DEPEND="${RDEPEND} + =sys-libs/db-1.85*" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + # 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 ... + # (23 Feb 2003) + "${FILESDIR}"/${MY_P}-fix-dep-link.patch + + "${FILESDIR}"/${MY_P}-gcc43.patch +) + +pkg_setup() { + # This doesn't build without exceptions + replace-flags -fno-exceptions -fexceptions +} + +src_prepare() { + for (( i=1 ; i<=${PATCHNO} ; i++ )) + do + eapply -p0 "${DISTDIR}"/patch."${MY_PV}"."${i}" + done + + default + + # We should get dump185 to link against system db1 .. + # (23 Feb 2003) + mv dist/Makefile.in{,.orig} || die + sed \ + -e 's:DB185INC=:DB185INC= -I/usr/include/db1:' \ + -e 's:DB185LIB=:DB185LIB= -ldb1:' \ + dist/Makefile.in.orig \ + > dist/Makefile.in || die + + cd dist || die + # remove config.guess else we have problems with gcc-3.2 + rm config.guess || die + sed -i "s,\(-D_GNU_SOURCE\),\1 ${CFLAGS}," configure || die +} + +src_configure() { + local conf=( + --host=${CHOST} + --build=${CHOST} + --enable-cxx + --enable-compat185 + --enable-dump185 + --libdir="${EPREFIX}"/usr/$(get_libdir) + --prefix="${EPREFIX}"/usr + ) + + local conf_shared=( + --disable-static + --enable-shared + + # --enable-rpc DOES NOT BUILD + # Robin H. Johnson (18 Oct 2003) + --enable-dynamic + ) + + local conf_static=( + --disable-shared + --enable-static + ) + + # TCL support is also broken + # Robin H. Johnson (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 build-static || die + pushd build-static &>/dev/null || die + strip="${EPREFIX}"/bin/true \ + ECONF_SOURCE="${S}"/dist \ + econf ${conf[@]} ${conf_static[@]} + popd &>/dev/null || die + + einfo "Configuring ${P} (shared)..." + mkdir build-shared || die + pushd build-shared &>/dev/null || die + strip="${EPREFIX}"/bin/true \ + ECONF_SOURCE="${S}"/dist \ + econf ${conf[@]} ${conf_shared[@]} + popd &>/dev/null || die +} + +src_compile() { + # Parallel make does not work + MAKEOPTS="${MAKEOPTS} -j1" + + einfo "Building ${P} (static)..." + pushd "${S}"/build-static &>/dev/null || die + emake strip="${EPREFIX}"/bin/true + popd &>/dev/null || die + + einfo "Building ${P} (shared)..." + pushd build-shared &>/dev/null || die + emake strip="${EPREFIX}"/bin/true + popd &>/dev/null || die +} + +src_install() { + pushd build-shared &>/dev/null || die + # build system does not support DESTDIR + emake \ + libdb=libdb-3.2.a \ + libcxx=libcxx_3.2.a \ + DESTDIR="${D}" \ + prefix="${ED}"/usr \ + libdir="${ED}"/usr/$(get_libdir) \ + strip="${EPREFIX}"/bin/true \ + install + popd &>/dev/null || die + + pushd build-static &>/dev/null || die + newlib.a libdb.a libdb-3.2.a + newlib.a libdb_cxx.a libdb_cxx-3.2.a + popd &>/dev/null || die + + 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 + pushd "${ED}"/usr/$(get_libdir) &>/dev/null || die + chmod go+rx *.so + # The .la's aren't readable either + chmod go+r *.la + popd &>/dev/null || die + + 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-3.2.9_p2.ebuild b/sys-libs/db/db-3.2.9_p2.ebuild deleted file mode 100644 index eac5cd83442e..000000000000 --- a/sys-libs/db/db-3.2.9_p2.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=0 - -inherit eutils db multilib - -#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 - -DESCRIPTION="Berkeley DB for transaction support in MySQL" -HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" -SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz" -for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do - export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" -done - -LICENSE="Sleepycat" -SLOT="3" -# This ebuild is to be the compatibility ebuild for when db4 is put -# in the tree. -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -IUSE="doc" - -DEPEND="${RDEPEND} - =sys-libs/db-1.85*" - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - # This doesn't build without exceptions - export CXXFLAGS="${CXXFLAGS/-fno-exceptions/-fexceptions}" - - unpack "${MY_P}".tar.gz - - chmod -R ug+w * - - cd "${WORKDIR}"/"${MY_P}" - for (( i=1 ; i<=${PATCHNO} ; i++ )) - do - epatch "${DISTDIR}"/patch."${MY_PV}"."${i}" - done - - # 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 ... - # (23 Feb 2003) - epatch "${FILESDIR}"/${MY_P}-fix-dep-link.patch - - # We should get dump185 to link against system db1 .. - # (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" - - epatch "${FILESDIR}"/${MY_P}-gcc43.patch - - # Fix invalid .la files - cd "${WORKDIR}"/${MY_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 - -} - -src_compile() { - local conf= - local conf_shared= - local conf_static= - - conf="${conf} - --host=${CHOST} \ - --build=${CHOST} \ - --enable-cxx \ - --enable-compat185 \ - --enable-dump185 \ - --prefix=${EPREFIX}/usr" - - # --enable-rpc DOES NOT BUILD - # Robin H. Johnson (18 Oct 2003) - - conf_shared="${conf_shared} - --enable-dynamic" - - # TCL support is also broken - # Robin H. Johnson (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 \ - ECONF_SOURCE="${S}"/dist econf \ - ${conf} ${conf_static} \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --disable-shared \ - --enable-static || die - - einfo "Configuring ${P} (shared)..." - mkdir -p "${S}"/build-shared - cd "${S}"/build-shared - strip="${ED}"/bin/true \ - ECONF_SOURCE="${S}"/dist econf \ - ${conf} ${conf_shared} \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --disable-static \ - --enable-shared || die - - # Parallel make does not work - MAKEOPTS="${MAKEOPTS} -j1" - einfo "Building ${P} (static)..." - cd "${S}"/build-static - emake strip="${EPREFIX}"/bin/true || die "Static build failed" - einfo "Building ${P} (shared)..." - cd "${S}"/build-shared - emake strip="${EPREFIX}"/bin/true || die "Shared build failed" -} - -src_install () { - cd "${S}"/build-shared - make libdb=libdb-3.2.a \ - libcxx=libcxx_3.2.a \ - prefix="${EPREFIX}"/usr \ - libdir="${EPREFIX}"/usr/$(get_libdir) \ - strip="${EPREFIX}"/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 "${ED}"/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_p5-r1.ebuild b/sys-libs/db/db-4.2.52_p5-r1.ebuild deleted file mode 100644 index f6cf119c6ae4..000000000000 --- a/sys-libs/db/db-4.2.52_p5-r1.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=0 - -inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib - -#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="Oracle Berkeley DB" -HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" -SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz" -for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do - export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" -done - -LICENSE="Sleepycat" -SLOT="4.2" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -IUSE="tcl java doc cxx rpc" - -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}"-4.2.52_p2-TXN.patch - epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.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}"-4.0.14-fix-dep-link.patch - - sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" -i dist/RELEASE - - # Include the SLOT for Java JAR files - # This supersedes the unused jarlocation patches. - sed -r -i \ - -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ - "${S}"/../dist/Makefile.in - - # START of 4.5+earlier specific - # Upstream sucks, they normally concat these - cd "${S}"/../dist/aclocal - for i in *; do ln -s $i ${i%.ac}.m4 ; done ; - cd "${S}"/../dist/aclocal_java - for i in *; do ln -s $i ${i%.ac}.m4 ; done ; - # END of 4.5+earlier specific - cd "${S}"/../dist - rm -f aclocal/libtool.{m4,ac} aclocal.m4 - sed -i \ - -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \ - configure.ac - sed -i \ - -e '/^AC_PATH_TOOL/s/ sh, missing_sh/ bash, missing_sh/' \ - aclocal/programs.m4 - AT_M4DIR="aclocal aclocal_java" eautoreconf - # Upstream sucks - they do autoconf and THEN replace the version variables. - . ./RELEASE - sed -i \ - -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \ - -e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \ - -e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \ - -e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \ - -e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \ - -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" configure -} - -src_compile() { - local myconf="" - - use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly" - - myconf="${myconf} $(use_enable cxx)" - - use tcl \ - && myconf="${myconf} --enable-tcl --with-tcl=${EPREFIX}/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 - - cd "${S}" && ECONF_SOURCE="${S}"/../dist econf \ - --prefix="${EPREFIX}"/usr \ - --mandir="${EPREFIX}"/usr/share/man \ - --infodir="${EPREFIX}"/usr/share/info \ - --datadir="${EPREFIX}"/usr/share \ - --sysconfdir="${EPREFIX}"/etc \ - --localstatedir="${EPREFIX}"/var/lib \ - --libdir="${EPREFIX}"/usr/"$(get_libdir)" \ - --enable-compat185 \ - --with-uniquename \ - $(use_enable rpc) \ - --host="${CHOST}" \ - ${myconf} "${javaconf}" || die "configure failed" - - # This isn't safe for prefix (Darwin should be .jnilib), but I can't get the - # build system to behave itself, it generates libtool too late. - sed -i \ - -e 's/-shrext $(SOFLAGS)/-shrext .so $(SOFLAGS)/g' \ - Makefile - emake || die "make failed" -} - -src_install() { - einstall libdir="${ED}/usr/$(get_libdir)" strip="${ED}/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 "${ED}"/usr/bin/berkeley_db_svc ]] && \ - mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc - - if use java; then - java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so - java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar - rm -f "${ED}"/usr/"$(get_libdir)"/*.jar - fi -} - -pkg_postinst() { - db_fix_so -} - -pkg_postrm() { - db_fix_so -} diff --git a/sys-libs/db/db-4.2.52_p5-r2.ebuild b/sys-libs/db/db-4.2.52_p5-r2.ebuild new file mode 100644 index 000000000000..ee47ba9b3833 --- /dev/null +++ b/sys-libs/db/db-4.2.52_p5-r2.ebuild @@ -0,0 +1,193 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools db flag-o-matic java-pkg-opt-2 multilib + +#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="Oracle Berkeley DB" +HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" +SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz" +for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do + export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" +done + +LICENSE="Sleepycat" +SLOT="4.2" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" +IUSE="tcl java doc cxx rpc" + +DEPEND="tcl? ( >=dev-lang/tcl-8.4 ) + java? ( >=virtual/jdk-1.4 )" +RDEPEND="tcl? ( dev-lang/tcl ) + java? ( >=virtual/jre-1.4 )" + +PATCHES=( + "${FILESDIR}"/"${PN}"-4.2.52_p2-TXN.patch + "${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch + + # use the includes from the prefix + "${FILESDIR}"/"${PN}"-"${SLOT}"-jni-check-prefix-first.patch + "${FILESDIR}"/"${PN}"-"${SLOT}"-listen-to-java-options.patch + "${FILESDIR}"/"${PN}"-4.0.14-fix-dep-link.patch +) + +# Required to avoid unpack attempt of patches +src_unpack() { + unpack ${MY_P}.tar.gz +} + +src_prepare() { + pushd "${WORKDIR}/${MY_P}" &>/dev/null || die + for (( i=1 ; i<=${PATCHNO} ; i++ )) + do + eapply -p0 "${DISTDIR}"/patch."${MY_PV}"."${i}" + done + + default + + sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" \ + -i dist/RELEASE || die + + # Include the SLOT for Java JAR files + # This supersedes the unused jarlocation patches. + sed -r \ + -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ + -i dist/Makefile.in || die + + # START of 4.5+earlier specific + # Upstream sucks, they normally concat these + local i j + for j in dist/aclocal{,_java} ; do + pushd ${j} &>/dev/null || die + for i in * ; do + ln -s ${i} ${i%.ac}.m4 || die + done + popd &>/dev/null || die + done + # END of 4.5+earlier specific + pushd dist &>/dev/null || die + rm aclocal/libtool.{m4,ac} || die + sed \ + -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \ + -i configure.ac || die + sed \ + -e '/^AC_PATH_TOOL/s/ sh, missing_sh/ bash, missing_sh/' \ + -i aclocal/programs.m4 || die + + AT_M4DIR="aclocal aclocal_java" eautoreconf + + # Upstream sucks - they do autoconf and THEN replace the version variables. + . ./RELEASE + sed \ + -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \ + -e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \ + -e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \ + -e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \ + -e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \ + -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" \ + -i configure || die + + popd &>/dev/null || die + popd &>/dev/null || die +} + +src_configure() { + local myconf=( + --prefix="${EPREFIX}"/usr + --mandir="${EPREFIX}"/usr/share/man + --infodir="${EPREFIX}"/usr/share/info + --datadir="${EPREFIX}"/usr/share + --sysconfdir="${EPREFIX}"/etc + --localstatedir="${EPREFIX}"/var/lib + --libdir="${EPREFIX}"/usr/"$(get_libdir)" + --enable-compat185 + --with-uniquename + $(use_enable rpc) + --host="${CHOST}" + + $(usex amd64 '--with-mutex=x86/gcc-assembly' '') + $(use_enable cxx) + $(use_enable tcl) + $(usex tcl "--with-tcl=${EPREFIX}/usr/$(get_libdir)" '') #" + $(use_enable java) + ) + + if use java; then + myconf+=( + --with-java-prefix="${JAVA_HOME}" + --with-javac-flags="$(java-pkg_javac-args)" + ) + fi + + [[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} ) + + # the entire testsuite needs the TCL functionality + if use tcl && use test; then + myconf+=( --enable-test ) + else + myconf+=( --disable-test ) + fi + + ECONF_SOURCE="${S}"/../dist \ + econf "${myconf[@]}" +} + +src_compile() { + # This isn't safe for prefix (Darwin should be .jnilib), but I can't get the + # build system to behave itself, it generates libtool too late. + sed \ + -e 's/-shrext $(SOFLAGS)/-shrext .so $(SOFLAGS)/g' \ + -i Makefile || die + emake +} + +src_install() { + emake \ + DESTDIR="${D}" \ + libdir="${EPREFIX}/usr/$(get_libdir)" \ + strip="${EPREFIX}/bin/strip" \ + install + + 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 + if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then + mv "${ED}"/usr/bin/berkeley_db_svc \ + "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die + fi + + if use java; then + java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so + java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar + rm -f "${ED}"/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_p1-r1.ebuild b/sys-libs/db/db-4.3.29_p1-r1.ebuild deleted file mode 100644 index 82815967b4a9..000000000000 --- a/sys-libs/db/db-4.3.29_p1-r1.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=0 - -inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib - -#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="Oracle Berkeley DB" -HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" -SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz" -for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do - export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" -done - -LICENSE="Sleepycat" -SLOT="4.3" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86" -IUSE="tcl java doc cxx rpc" - -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 - - # 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}"-4.3.27-fix-dep-link.patch - - sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" -i dist/RELEASE - - # Include the SLOT for Java JAR files - # This supersedes the unused jarlocation patches. - sed -r -i \ - -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ - "${S}"/../dist/Makefile.in - - # START of 4.5+earlier specific - # Upstream sucks, they normally concat these - cd "${S}"/../dist/aclocal - for i in *; do ln -s $i ${i%.ac}.m4 ; done ; - cd "${S}"/../dist/aclocal_java - for i in *; do ln -s $i ${i%.ac}.m4 ; done ; - # END of 4.5+earlier specific - cd "${S}"/../dist - rm -f aclocal/libtool.{m4,ac} aclocal.m4 - sed -i \ - -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \ - configure.ac - sed -i \ - -e '/^AC_PATH_TOOL/s/ sh, missing_sh/ bash, missing_sh/' \ - aclocal/programs.m4 - AT_M4DIR="aclocal aclocal_java" eautoreconf - # Upstream sucks - they do autoconf and THEN replace the version variables. - . ./RELEASE - sed -i \ - -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \ - -e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \ - -e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \ - -e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \ - -e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \ - -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" configure -} - -src_compile() { - local myconf="" - - use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly" - - myconf="${myconf} $(use_enable cxx)" - - use tcl \ - && myconf="${myconf} --enable-tcl --with-tcl=${EPREFIX}/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 - - cd "${S}" && ECONF_SOURCE="${S}"/../dist econf \ - --prefix="${EPREFIX}"/usr \ - --mandir="${EPREFIX}"/usr/share/man \ - --infodir="${EPREFIX}"/usr/share/info \ - --datadir="${EPREFIX}"/usr/share \ - --sysconfdir="${EPREFIX}"/etc \ - --localstatedir="${EPREFIX}"/var/lib \ - --libdir="${EPREFIX}"/usr/"$(get_libdir)" \ - --enable-compat185 \ - --enable-o_direct \ - --without-uniquename \ - $(use_enable rpc) \ - --host="${CHOST}" \ - ${myconf} "${javaconf}" || die "configure failed" - - emake || die "make failed" -} - -src_install() { - einstall libdir="${ED}/usr/$(get_libdir)" strip="${ED}/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 "${ED}"/usr/bin/berkeley_db_svc ]] && \ - mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc - - if use java; then - java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so - java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar - rm -f "${ED}"/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_p1-r2.ebuild b/sys-libs/db/db-4.3.29_p1-r2.ebuild new file mode 100644 index 000000000000..1a90b1c6f2f1 --- /dev/null +++ b/sys-libs/db/db-4.3.29_p1-r2.ebuild @@ -0,0 +1,192 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools db flag-o-matic java-pkg-opt-2 multilib + +#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="Oracle Berkeley DB" +HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" +SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz" +for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do + export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" +done + +LICENSE="Sleepycat" +SLOT="4.3" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86" +IUSE="tcl java doc cxx rpc" + +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 )" + +PATCHES=( + "${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch + + # use the includes from the prefix + "${FILESDIR}"/"${PN}"-"${SLOT}"-jni-check-prefix-first.patch + "${FILESDIR}"/"${PN}"-"${SLOT}"-listen-to-java-options.patch + + "${FILESDIR}"/"${PN}"-4.3.27-fix-dep-link.patch +) + +# Required to avoid unpack attempt of patches +src_unpack() { + unpack "${MY_P}".tar.gz +} + +src_prepare() { + pushd "${WORKDIR}"/"${MY_P}" &>/dev/null || die + for (( i=1 ; i<=${PATCHNO} ; i++ )) + do + eapply -p0 "${DISTDIR}"/patch."${MY_PV}"."${i}" + done + + default + + sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" \ + -i dist/RELEASE || die + + # Include the SLOT for Java JAR files + # This supersedes the unused jarlocation patches. + sed -r \ + -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ + dist/Makefile.in || die + + # START of 4.5+earlier specific + # Upstream sucks, they normally concat these + local i j + for j in dist/aclocal{,_java} ; do + pushd ${j} &>/dev/null || die + for i in * ; do + ln -s ${i} ${i%.ac}.m4 || die + done + popd &>/dev/null || die + done + # END of 4.5+earlier specific + + pushd dist &>/dev/null || die + rm aclocal/libtool.{m4,ac} || die + sed \ + -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \ + -i configure.ac || die + sed \ + -e '/^AC_PATH_TOOL/s/ sh, missing_sh/ bash, missing_sh/' \ + -i aclocal/programs.m4 || die + + AT_M4DIR="aclocal aclocal_java" eautoreconf + + # Upstream sucks - they do autoconf and THEN replace the version variables. + . ./RELEASE + sed \ + -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \ + -e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \ + -e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \ + -e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \ + -e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \ + -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" \ + -i configure || die + popd &>/dev/null || die + popd &>/dev/null || die +} + +src_configure() { + local myconf=( + --prefix="${EPREFIX}"/usr + --mandir="${EPREFIX}"/usr/share/man + --infodir="${EPREFIX}"/usr/share/info + --datadir="${EPREFIX}"/usr/share + --sysconfdir="${EPREFIX}"/etc + --localstatedir="${EPREFIX}"/var/lib + --libdir="${EPREFIX}"/usr/"$(get_libdir)" + --enable-compat185 + --enable-o_direct + --without-uniquename + $(use_enable rpc) + --host="${CHOST}" + + $(usex amd64 '--with-mutex=x86/gcc-assembly' '') + $(use_enable cxx) + $(use_enable tcl) + $(usex tcl "--with-tcl=${EPREFIX}/usr/$(get_libdir)" '') #" + $(use_enable java) + ) + + if use java; then + myconf+=( + --with-java-prefix="${JAVA_HOME}" + --with-javac-flags="$(java-pkg_javac-args)" + ) + fi + + [[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} ) + + # the entire testsuite needs the TCL functionality + if use tcl && use test ; then + myconf+=( --enable-test ) + else + 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 + + ECONF_SOURCE="${S}"/../dist \ + econf "${myconf[@]}" +} + +src_install() { + emake \ + DESTDIR="${D}" \ + libdir="${EPREFIX}/usr/$(get_libdir)" \ + strip="${EPREFIX}/bin/strip" \ + install + + 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 + if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then + mv "${ED}"/usr/bin/berkeley_db_svc \ + "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die + fi + + if use java; then + java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so + java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar + rm -f "${ED}"/usr/"$(get_libdir)"/*.jar + fi +} + +pkg_postinst() { + db_fix_so +} + +pkg_postrm() { + db_fix_so +} diff --git a/sys-libs/db/db-4.4.20_p4-r1.ebuild b/sys-libs/db/db-4.4.20_p4-r1.ebuild deleted file mode 100644 index 05a30a452450..000000000000 --- a/sys-libs/db/db-4.4.20_p4-r1.ebuild +++ /dev/null @@ -1,164 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=0 - -inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib - -#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="Oracle Berkeley DB" -HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" -SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz - mirror://gentoo/${MY_P}-20060110-rpc_server-java.tar.gz" -for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do - export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" -done - -LICENSE="Sleepycat BSD" -SLOT="4.4" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="tcl java doc cxx rpc" - -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 - unpack "${MY_P}-20060110-rpc_server-java".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 - - # use the includes from the prefix - epatch "${FILESDIR}"/"${PN}"-4.3-jni-check-prefix-first.patch - epatch "${FILESDIR}"/"${PN}"-4.3-listen-to-java-options.patch - - sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" -i dist/RELEASE - - # Include the SLOT for Java JAR files - # This supersedes the unused jarlocation patches. - sed -r -i \ - -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ - "${S}"/../dist/Makefile.in - - # START of 4.5+earlier specific - # Upstream sucks, they normally concat these - cd "${S}"/../dist/aclocal - for i in *; do ln -s $i ${i%.ac}.m4 ; done ; - cd "${S}"/../dist/aclocal_java - for i in *; do ln -s $i ${i%.ac}.m4 ; done ; - # END of 4.5+earlier specific - cd "${S}"/../dist - rm -f aclocal/libtool.{m4,ac} aclocal.m4 - AT_M4DIR="aclocal aclocal_java" eautoreconf - # Upstream sucks - they do autoconf and THEN replace the version variables. - . ./RELEASE - sed -i \ - -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \ - -e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \ - -e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \ - -e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \ - -e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \ - -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" configure -} - -src_compile() { - local myconf="" - - use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly" - - myconf="${myconf} $(use_enable cxx)" - - use tcl \ - && myconf="${myconf} --enable-tcl --with-tcl=${EPREFIX}/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 - - cd "${S}" && ECONF_SOURCE="${S}"/../dist econf \ - --prefix="${EPREFIX}"/usr \ - --mandir="${EPREFIX}"/usr/share/man \ - --infodir="${EPREFIX}"/usr/share/info \ - --datadir="${EPREFIX}"/usr/share \ - --sysconfdir="${EPREFIX}"/etc \ - --localstatedir="${EPREFIX}"/var/lib \ - --libdir="${EPREFIX}"/usr/"$(get_libdir)" \ - --enable-compat185 \ - --enable-o_direct \ - --without-uniquename \ - $(use_enable rpc) \ - --host="${CHOST}" \ - ${myconf} "${javaconf}" || die "configure failed" - - emake -j1 || die "make failed" -} - -src_install() { - einstall libdir="${ED}/usr/$(get_libdir)" strip="${ED}/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 "${ED}"/usr/bin/berkeley_db_svc ]] && \ - mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc - - if use java; then - java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so - java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar - rm -f "${ED}"/usr/"$(get_libdir)"/*.jar - fi -} - -pkg_postinst() { - db_fix_so -} - -pkg_postrm() { - db_fix_so -} diff --git a/sys-libs/db/db-4.4.20_p4-r2.ebuild b/sys-libs/db/db-4.4.20_p4-r2.ebuild new file mode 100644 index 000000000000..441402e080c8 --- /dev/null +++ b/sys-libs/db/db-4.4.20_p4-r2.ebuild @@ -0,0 +1,186 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools db flag-o-matic java-pkg-opt-2 multilib + +#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="Oracle Berkeley DB" +HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" +SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz + mirror://gentoo/${MY_P}-20060110-rpc_server-java.tar.gz" +for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do + export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" +done + +LICENSE="Sleepycat BSD" +SLOT="4.4" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="tcl java doc cxx rpc" + +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 )" + +PATCHES=( + "${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch + + # use the includes from the prefix + "${FILESDIR}"/"${PN}"-4.3-jni-check-prefix-first.patch + "${FILESDIR}"/"${PN}"-4.3-listen-to-java-options.patch +) + +# Required to avoid unpack attempt of patches +src_unpack() { + unpack "${MY_P}".tar.gz + unpack "${MY_P}-20060110-rpc_server-java".tar.gz +} + +src_prepare() { + pushd "${WORKDIR}"/"${MY_P}" &>/dev/null || die + for (( i=1 ; i<=${PATCHNO} ; i++ )) + do + eapply -p0 "${DISTDIR}"/patch."${MY_PV}"."${i}" + done + + default + + sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" \ + -i dist/RELEASE || die + + # Include the SLOT for Java JAR files + # This supersedes the unused jarlocation patches. + sed -r \ + -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ + -i dist/Makefile.in || die + + # START of 4.5+earlier specific + # Upstream sucks, they normally concat these + local i j + for j in dist/aclocal{,_java} ; do + pushd ${j} &>/dev/null || die + for i in * ; do + ln -s ${i} ${i%.ac}.m4 || die + done + popd &>/dev/null || die + done + # END of 4.5+earlier specific + pushd dist &>/dev/null || die + rm -f aclocal/libtool.{m4,ac} || die + + AT_M4DIR="aclocal aclocal_java" eautoreconf + + # Upstream sucks - they do autoconf and THEN replace the version variables. + . ./RELEASE + sed \ + -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \ + -e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \ + -e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \ + -e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \ + -e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \ + -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" \ + -i configure || die + + popd &>/dev/null || die + popd &>/dev/null || die +} + +src_configure() { + local myconf=( + --prefix="${EPREFIX}"/usr + --mandir="${EPREFIX}"/usr/share/man + --infodir="${EPREFIX}"/usr/share/info + --datadir="${EPREFIX}"/usr/share + --sysconfdir="${EPREFIX}"/etc + --localstatedir="${EPREFIX}"/var/lib + --libdir="${EPREFIX}"/usr/"$(get_libdir)" + --enable-compat185 + --enable-o_direct + --without-uniquename + $(use_enable rpc) + --host="${CHOST}" + + $(usex amd64 '--with-mutex=x86/gcc-assembly' '') + $(use_enable cxx) + $(use_enable tcl) + $(usex tcl "--with-tcl=${EPREFIX}/usr/$(get_libdir)" '') #" + $(use_enable java) + ) + + if use java; then + myconf+=( + --with-java-prefix="${JAVA_HOME}" + --with-javac-flags="$(java-pkg_javac-args)" + ) + fi + + [[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} ) + + # the entire testsuite needs the TCL functionality + if use tcl && use test ; then + myconf+=( --enable-test ) + else + 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 + + ECONF_SOURCE="${S}"/../dist \ + econf "${myconf[@]}" +} + +src_install() { + emake \ + DESTDIR="${D}" \ + libdir="${EPREFIX}/usr/$(get_libdir)" \ + strip="${EPREFIX}/bin/strip" \ + install + + 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 + if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then + mv "${ED}"/usr/bin/berkeley_db_svc \ + "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die + fi + + if use java; then + java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so + java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar + rm -f "${ED}"/usr/"$(get_libdir)"/*.jar + fi +} + +pkg_postinst() { + db_fix_so +} + +pkg_postrm() { + db_fix_so +} diff --git a/sys-libs/db/files/db-1.85-gentoo-paths.patch b/sys-libs/db/files/db-1.85-gentoo-paths.patch index 4a65106bdc70..8154300f67bc 100644 --- a/sys-libs/db/files/db-1.85-gentoo-paths.patch +++ b/sys-libs/db/files/db-1.85-gentoo-paths.patch @@ -1,5 +1,5 @@ ---- PORT/linux/Makefile -+++ PORT/linux/Makefile +--- a/PORT/linux/Makefile ++++ b/PORT/linux/Makefile @@ -1,12 +1,12 @@ # @(#)Makefile 8.9 (Berkeley) 7/14/94 diff --git a/sys-libs/db/files/db-3.2.9-gcc43.patch b/sys-libs/db/files/db-3.2.9-gcc43.patch index f032da85296a..17bdddf3d8df 100644 --- a/sys-libs/db/files/db-3.2.9-gcc43.patch +++ b/sys-libs/db/files/db-3.2.9-gcc43.patch @@ -5,7 +5,7 @@ diff -Nuar db-3.2.9.orig/include/db_cxx.h db-3.2.9/include/db_cxx.h // Forward declarations // -+#if defined(__GNUC__) && (__GNUC__ == 4 && __GNUC_MINOR__ >= 2) ++#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) +using namespace std; +#include +#else diff --git a/sys-libs/db/files/db-4.2-jni-check-prefix-first.patch b/sys-libs/db/files/db-4.2-jni-check-prefix-first.patch index 17f80e1bcfef..0777c706d0bf 100644 --- a/sys-libs/db/files/db-4.2-jni-check-prefix-first.patch +++ b/sys-libs/db/files/db-4.2-jni-check-prefix-first.patch @@ -1,5 +1,5 @@ ---- dist/aclocal_java/ac_jni_include_dirs.ac 2003-10-06 20:41:38.000000000 +0200 -+++ dist/aclocal_java/ac_jni_include_dirs.ac 2005-09-23 21:31:26.000000000 +0200 +--- a/dist/aclocal_java/ac_jni_include_dirs.ac ++++ b/dist/aclocal_java/ac_jni_include_dirs.ac @@ -43,14 +43,19 @@ *) AC_MSG_ERROR([$_ACJNI_JAVAC is not an absolute path name]);; esac diff --git a/sys-libs/db/files/db-4.2-listen-to-java-options.patch b/sys-libs/db/files/db-4.2-listen-to-java-options.patch index 8ddb46b70261..f1f701de1261 100644 --- a/sys-libs/db/files/db-4.2-listen-to-java-options.patch +++ b/sys-libs/db/files/db-4.2-listen-to-java-options.patch @@ -1,5 +1,5 @@ ---- dist/configure.ac 2005-09-23 21:01:26.000000000 +0200 -+++ dist/configure.ac 2005-09-23 20:59:20.000000000 +0200 +--- a/dist/configure.ac ++++ b/dist/configure.ac @@ -385,6 +385,7 @@ # A classpath that includes . is needed to check for Java CLASSPATH=".:$CLASSPATH" diff --git a/sys-libs/db/files/db-4.2.52_p2-TXN.patch b/sys-libs/db/files/db-4.2.52_p2-TXN.patch index 7ff8874c0ca8..a9ca9ef132f3 100644 --- a/sys-libs/db/files/db-4.2.52_p2-TXN.patch +++ b/sys-libs/db/files/db-4.2.52_p2-TXN.patch @@ -21,8 +21,8 @@ RCS file: /var/CVSROOT/bdb42/dbinc/db.in,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 ---- dbinc/db.in 25 Nov 2003 21:58:02 -0000 1.1.1.1 -+++ dbinc/db.in 17 Jul 2004 16:07:23 -0000 1.2 +--- a/dbinc/db.in 25 Nov 2003 21:58:02 -0000 1.1.1.1 ++++ b/dbinc/db.in 17 Jul 2004 16:07:23 -0000 1.2 @@ -839,6 +839,7 @@ #define TXN_NOWAIT 0x040 /* Do not wait on locks. */ #define TXN_RESTORED 0x080 /* Transaction has been restored. */ @@ -37,8 +37,8 @@ RCS file: /var/CVSROOT/bdb42/txn/txn.c,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -r1.1.1.2 -r1.2 ---- txn/txn.c 17 Dec 2003 21:43:53 -0000 1.1.1.2 -+++ txn/txn.c 17 Jul 2004 16:07:27 -0000 1.2 +--- a/txn/txn.c 17 Dec 2003 21:43:53 -0000 1.1.1.2 ++++ b/txn/txn.c 17 Jul 2004 16:07:27 -0000 1.2 @@ -127,7 +127,7 @@ if ((ret = __db_fchk(dbenv, "txn_begin", flags, diff --git a/sys-libs/db/files/db-4.3-jni-check-prefix-first.patch b/sys-libs/db/files/db-4.3-jni-check-prefix-first.patch index 17f80e1bcfef..0777c706d0bf 100644 --- a/sys-libs/db/files/db-4.3-jni-check-prefix-first.patch +++ b/sys-libs/db/files/db-4.3-jni-check-prefix-first.patch @@ -1,5 +1,5 @@ ---- dist/aclocal_java/ac_jni_include_dirs.ac 2003-10-06 20:41:38.000000000 +0200 -+++ dist/aclocal_java/ac_jni_include_dirs.ac 2005-09-23 21:31:26.000000000 +0200 +--- a/dist/aclocal_java/ac_jni_include_dirs.ac ++++ b/dist/aclocal_java/ac_jni_include_dirs.ac @@ -43,14 +43,19 @@ *) AC_MSG_ERROR([$_ACJNI_JAVAC is not an absolute path name]);; esac diff --git a/sys-libs/db/files/db-4.3-libtool.patch b/sys-libs/db/files/db-4.3-libtool.patch index 426fd519f714..c594f73c748f 100644 --- a/sys-libs/db/files/db-4.3-libtool.patch +++ b/sys-libs/db/files/db-4.3-libtool.patch @@ -1,5 +1,5 @@ ---- dist/configure.orig 2005-02-02 11:22:49.596096072 +0100 -+++ dist/configure 2005-02-02 11:23:46.749407448 +0100 +--- a/dist/configure ++++ b/dist/configure @@ -5684,7 +5684,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else diff --git a/sys-libs/db/files/db-4.4-libtool.patch b/sys-libs/db/files/db-4.4-libtool.patch index 3d86b88f86b3..b4d2fc8d73cf 100644 --- a/sys-libs/db/files/db-4.4-libtool.patch +++ b/sys-libs/db/files/db-4.4-libtool.patch @@ -1,5 +1,5 @@ ---- dist/configure.orig 2006-01-31 10:23:58.000000000 +0100 -+++ dist/configure 2006-01-31 10:26:43.000000000 +0100 +--- a/dist/configure ++++ b/dist/configure @@ -5765,7 +5765,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else -- cgit v1.2.3-65-gdbad