-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=0
+EAPI=7
-inherit eutils toolchain-funcs multilib multilib
+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/${PF}.1.patch.bz2"
+ 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.
DEPEND=""
-S=${WORKDIR}/db.${PV}
+S="${WORKDIR}/db.${PV}"
+
+PATCHES=(
+ "${WORKDIR}"/${P}-r3.1.patch
+ "${FILESDIR}"/${P}-gentoo-paths.patch
+)
+
+src_prepare() {
+ default
-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
+ 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 || die
+ dosym libdb1.so.2 /usr/$(get_libdir)/libdb.so.2
- dosed "s:<db.h>:<db1/db.h>:" /usr/include/db1/ndbm.h
+ sed -e "s:<db.h>:<db1/db.h>:" \
+ -i "${ED}"/usr/include/db1/ndbm.h || die
dosym db1/ndbm.h /usr/include/ndbm.h
dodoc changelog README
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=0
+EAPI=7
-inherit eutils db multilib
+inherit db flag-o-matic multilib
#Number of official patches
#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
-PATCHNO=${PV/*.*.*_p}
+PATCHNO="${PV/*.*.*_p}"
if [[ ${PATCHNO} == "${PV}" ]] ; then
- MY_PV=${PV}
- MY_P=${P}
+ MY_PV="${PV}"
+ MY_P="${P}"
PATCHNO=0
else
- MY_PV=${PV/_p${PATCHNO}}
- MY_P=${PN}-${MY_PV}
+ MY_PV="${PV/_p${PATCHNO}}"
+ MY_P="${PN}-${MY_PV}"
fi
DESCRIPTION="Berkeley DB for transaction support in MySQL"
S="${WORKDIR}/${MY_P}"
-src_unpack() {
- # This doesn't build without exceptions
- export CXXFLAGS="${CXXFLAGS/-fno-exceptions/-fexceptions}"
+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 ...
+ # <azarah@gentoo.org> (23 Feb 2003)
+ "${FILESDIR}"/${MY_P}-fix-dep-link.patch
- unpack "${MY_P}".tar.gz
+ "${FILESDIR}"/${MY_P}-gcc43.patch
+)
- chmod -R ug+w *
+pkg_setup() {
+ # This doesn't build without exceptions
+ replace-flags -fno-exceptions -fexceptions
+}
- cd "${WORKDIR}"/"${MY_P}"
+src_prepare() {
for (( i=1 ; i<=${PATCHNO} ; i++ ))
do
- epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
+ eapply -p0 "${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 ...
- # <azarah@gentoo.org> (23 Feb 2003)
- epatch "${FILESDIR}"/${MY_P}-fix-dep-link.patch
+ default
# 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:' \
+ mv dist/Makefile.in{,.orig} || die
+ 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
+ dist/Makefile.in.orig \
+ > dist/Makefile.in || die
- # Fix invalid .la files
- cd "${WORKDIR}"/${MY_P}/dist
- rm -f ltversion.sh
+ cd dist || die
# remove config.guess else we have problems with gcc-3.2
- rm -f config.guess
- sed -i "s,\(-D_GNU_SOURCE\),\1 ${CFLAGS}," configure
-
+ rm config.guess || die
+ sed -i "s,\(-D_GNU_SOURCE\),\1 ${CFLAGS}," configure || die
}
-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 <robbat2@gentoo.org> (18 Oct 2003)
-
- conf_shared="${conf_shared}
- --enable-dynamic"
+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 <robbat2@gentoo.org> (18 Oct 2003)
+ --enable-dynamic
+ )
+
+ local conf_static=(
+ --disable-shared
+ --enable-static
+ )
# TCL support is also broken
# Robin H. Johnson <robbat2@gentoo.org> (18 Oct 2003)
# 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
+ 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 -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
+ 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)..."
- cd "${S}"/build-static
- emake strip="${EPREFIX}"/bin/true || die "Static build failed"
+ pushd "${S}"/build-static &>/dev/null || die
+ emake strip="${EPREFIX}"/bin/true
+ popd &>/dev/null || die
+
einfo "Building ${P} (shared)..."
- cd "${S}"/build-shared
- emake strip="${EPREFIX}"/bin/true || die "Shared build failed"
+ pushd build-shared &>/dev/null || die
+ emake strip="${EPREFIX}"/bin/true
+ popd &>/dev/null || die
}
-src_install () {
- cd "${S}"/build-shared
- make libdb=libdb-3.2.a \
+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 \
- prefix="${EPREFIX}"/usr \
- libdir="${EPREFIX}"/usr/$(get_libdir) \
+ DESTDIR="${D}" \
+ prefix="${ED}"/usr \
+ libdir="${ED}"/usr/$(get_libdir) \
strip="${EPREFIX}"/bin/true \
- install || die
+ install
+ popd &>/dev/null || 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!"
+ 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!"
# 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)
+ 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
- cd "${S}"
dodoc README
db_src_install_doc || die "db_src_install_doc failed!"
db_src_install_usrlibcleanup || die "db_src_install_usrlibcleanup failed!"
}
-pkg_postinst () {
+pkg_postinst() {
db_fix_so
}
-pkg_postrm () {
+pkg_postrm() {
db_fix_so
}
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=0
+EAPI=7
-inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib
+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}
+PATCHNO="${PV/*.*.*_p}"
if [[ ${PATCHNO} == "${PV}" ]] ; then
- MY_PV=${PV}
- MY_P=${P}
+ MY_PV="${PV}"
+ MY_P="${P}"
PATCHNO=0
else
- MY_PV=${PV/_p${PATCHNO}}
- MY_P=${PN}-${MY_PV}
+ MY_PV="${PV/_p${PATCHNO}}"
+ MY_P="${PN}-${MY_PV}"
fi
S="${WORKDIR}/${MY_P}/build_unix"
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
- cd "${WORKDIR}"/"${MY_P}"
+ unpack ${MY_P}.tar.gz
+}
+
+src_prepare() {
+ pushd "${WORKDIR}/${MY_P}" &>/dev/null || die
for (( i=1 ; i<=${PATCHNO} ; i++ ))
do
- epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
+ eapply -p0 "${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
+ default
- sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" -i dist/RELEASE
+ 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 -i \
+ sed -r \
-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
- "${S}"/../dist/Makefile.in
+ -i dist/Makefile.in || die
# 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 ;
+ 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
- cd "${S}"/../dist
- rm -f aclocal/libtool.{m4,ac} aclocal.m4
- sed -i \
+ pushd dist &>/dev/null || die
+ rm aclocal/libtool.{m4,ac} || die
+ sed \
-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
- configure.ac
- sed -i \
+ -i configure.ac || die
+ sed \
-e '/^AC_PATH_TOOL/s/ sh, missing_sh/ bash, missing_sh/' \
- aclocal/programs.m4
+ -i aclocal/programs.m4 || die
+
AT_M4DIR="aclocal aclocal_java" eautoreconf
+
# Upstream sucks - they do autoconf and THEN replace the version variables.
. ./RELEASE
- sed -i \
+ 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" configure
-}
-
-src_compile() {
- local myconf=""
-
- use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
+ -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" \
+ -i configure || die
- myconf="${myconf} $(use_enable cxx)"
+ popd &>/dev/null || die
+ popd &>/dev/null || die
+}
- use tcl \
- && myconf="${myconf} --enable-tcl --with-tcl=${EPREFIX}/usr/$(get_libdir)" \
- || myconf="${myconf} --disable-tcl"
+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)
+ )
- 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)"
+ myconf+=(
+ --with-java-prefix="${JAVA_HOME}"
+ --with-javac-flags="$(java-pkg_javac-args)"
+ )
fi
- [[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
+ [[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
# the entire testsuite needs the TCL functionality
if use tcl && use test; then
- myconf="${myconf} --enable-test"
+ myconf+=( --enable-test )
else
- myconf="${myconf} --disable-test"
+ 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"
+ 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 -i \
+ sed \
-e 's/-shrext $(SOFLAGS)/-shrext .so $(SOFLAGS)/g' \
- Makefile
- emake || die "make failed"
+ -i Makefile || die
+ emake
}
src_install() {
- einstall libdir="${ED}/usr/$(get_libdir)" strip="${ED}/bin/strip" || die
+ emake \
+ DESTDIR="${D}" \
+ libdir="${EPREFIX}/usr/$(get_libdir)" \
+ strip="${EPREFIX}/bin/strip" \
+ install
db_src_install_usrbinslot
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 [[ -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
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=0
+EAPI=7
-inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib
+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}
+PATCHNO="${PV/*.*.*_p}"
if [[ ${PATCHNO} == "${PV}" ]] ; then
- MY_PV=${PV}
- MY_P=${P}
+ MY_PV="${PV}"
+ MY_P="${P}"
PATCHNO=0
else
- MY_PV=${PV/_p${PATCHNO}}
- MY_P=${PN}-${MY_PV}
+ MY_PV="${PV/_p${PATCHNO}}"
+ MY_P="${PN}-${MY_PV}"
fi
S="${WORKDIR}/${MY_P}/build_unix"
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
- cd "${WORKDIR}"/"${MY_P}"
+}
+
+src_prepare() {
+ pushd "${WORKDIR}"/"${MY_P}" &>/dev/null || die
for (( i=1 ; i<=${PATCHNO} ; i++ ))
do
- epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
+ eapply -p0 "${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
+ default
- sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" -i dist/RELEASE
+ 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 -i \
+ sed -r \
-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
- "${S}"/../dist/Makefile.in
+ dist/Makefile.in || die
# 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 ;
+ 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
- cd "${S}"/../dist
- rm -f aclocal/libtool.{m4,ac} aclocal.m4
- sed -i \
+
+ pushd dist &>/dev/null || die
+ rm aclocal/libtool.{m4,ac} || die
+ sed \
-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
- configure.ac
- sed -i \
+ -i configure.ac || die
+ sed \
-e '/^AC_PATH_TOOL/s/ sh, missing_sh/ bash, missing_sh/' \
- aclocal/programs.m4
+ -i aclocal/programs.m4 || die
+
AT_M4DIR="aclocal aclocal_java" eautoreconf
+
# Upstream sucks - they do autoconf and THEN replace the version variables.
. ./RELEASE
- sed -i \
+ 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" configure
+ -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" \
+ -i configure || die
+ popd &>/dev/null || die
+ popd &>/dev/null || die
}
-src_compile() {
- local myconf=""
+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)
+ )
- 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)"
+ myconf+=(
+ --with-java-prefix="${JAVA_HOME}"
+ --with-javac-flags="$(java-pkg_javac-args)"
+ )
fi
- [[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
+ [[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
# the entire testsuite needs the TCL functionality
if use tcl && use test ; then
- myconf="${myconf} --enable-test"
+ myconf+=( --enable-test )
else
- myconf="${myconf} --disable-test"
+ myconf+=( --disable-test )
fi
# Add linker versions to the symbols. Easier to do, and safer than header
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"
+ ECONF_SOURCE="${S}"/../dist \
+ econf "${myconf[@]}"
}
src_install() {
- einstall libdir="${ED}/usr/$(get_libdir)" strip="${ED}/bin/strip" || die
+ emake \
+ DESTDIR="${D}" \
+ libdir="${EPREFIX}/usr/$(get_libdir)" \
+ strip="${EPREFIX}/bin/strip" \
+ install
db_src_install_usrbinslot
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 [[ -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
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=0
+EAPI=7
-inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib
+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}
+PATCHNO="${PV/*.*.*_p}"
if [[ ${PATCHNO} == "${PV}" ]] ; then
- MY_PV=${PV}
- MY_P=${P}
+ MY_PV="${PV}"
+ MY_P="${P}"
PATCHNO=0
else
- MY_PV=${PV/_p${PATCHNO}}
- MY_P=${PN}-${MY_PV}
+ MY_PV="${PV/_p${PATCHNO}}"
+ MY_P="${PN}-${MY_PV}"
fi
S="${WORKDIR}/${MY_P}/build_unix"
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
- cd "${WORKDIR}"/"${MY_P}"
+}
+
+src_prepare() {
+ pushd "${WORKDIR}"/"${MY_P}" &>/dev/null || die
for (( i=1 ; i<=${PATCHNO} ; i++ ))
do
- epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
+ eapply -p0 "${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
+ default
- sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" -i dist/RELEASE
+ 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 -i \
+ sed -r \
-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
- "${S}"/../dist/Makefile.in
+ -i dist/Makefile.in || die
# 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 ;
+ 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
- cd "${S}"/../dist
- rm -f aclocal/libtool.{m4,ac} aclocal.m4
+ 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 -i \
+ 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" configure
-}
-
-src_compile() {
- local myconf=""
+ -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" \
+ -i configure || die
- use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
-
- myconf="${myconf} $(use_enable cxx)"
+ popd &>/dev/null || die
+ popd &>/dev/null || die
+}
- use tcl \
- && myconf="${myconf} --enable-tcl --with-tcl=${EPREFIX}/usr/$(get_libdir)" \
- || myconf="${myconf} --disable-tcl"
+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)
+ )
- 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)"
+ myconf+=(
+ --with-java-prefix="${JAVA_HOME}"
+ --with-javac-flags="$(java-pkg_javac-args)"
+ )
fi
- [[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
+ [[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
# the entire testsuite needs the TCL functionality
if use tcl && use test ; then
- myconf="${myconf} --enable-test"
+ myconf+=( --enable-test )
else
- myconf="${myconf} --disable-test"
+ myconf+=( --disable-test )
fi
# Add linker versions to the symbols. Easier to do, and safer than header file
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"
+ ECONF_SOURCE="${S}"/../dist \
+ econf "${myconf[@]}"
}
src_install() {
- einstall libdir="${ED}/usr/$(get_libdir)" strip="${ED}/bin/strip" || die
+ emake \
+ DESTDIR="${D}" \
+ libdir="${EPREFIX}/usr/$(get_libdir)" \
+ strip="${EPREFIX}/bin/strip" \
+ install
db_src_install_usrbinslot
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 [[ -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
---- 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
// Forward declarations
//
-+#if defined(__GNUC__) && (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)
++#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+using namespace std;
+#include <iostream>
+#else
---- 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
---- 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"
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. */
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,
---- 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
---- 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
---- 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
projects / gentoo.git / commitdiff