From 27cf903964350fa806be72afb6553c07df9d61eb Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 16 Aug 2008 20:11:21 +0000 Subject: Fix 4.4 slot for SONAME bug #182972, java support bug #217661 and also properly do what the jarlocation patches were supported to do. (Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64) --- sys-libs/db/ChangeLog | 9 +- sys-libs/db/db-4.4.20_p4-r1.ebuild | 166 +++++++++++++++++++++++++++++++++++++ 2 files changed, 174 insertions(+), 1 deletion(-) create mode 100644 sys-libs/db/db-4.4.20_p4-r1.ebuild (limited to 'sys-libs') diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog index 1a5f4405a827..3818fc7769d3 100644 --- a/sys-libs/db/ChangeLog +++ b/sys-libs/db/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-libs/db # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.256 2008/08/16 20:00:28 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.257 2008/08/16 20:11:21 robbat2 Exp $ + +*db-4.4.20_p4-r1 (16 Aug 2008) + + 16 Aug 2008; Robin H. Johnson + +db-4.4.20_p4-r1.ebuild: + Fix 4.4 slot for SONAME bug #182972, java support bug #217661 and also + properly do what the jarlocation patches were supported to do. *db-4.5.20_p2-r1 (16 Aug 2008) diff --git a/sys-libs/db/db-4.4.20_p4-r1.ebuild b/sys-libs/db/db-4.4.20_p4-r1.ebuild new file mode 100644 index 000000000000..be5389ba8c7a --- /dev/null +++ b/sys-libs/db/db-4.4.20_p4-r1.ebuild @@ -0,0 +1,166 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.4.20_p4-r1.ebuild,v 1.1 2008/08/16 20:11:21 robbat2 Exp $ + +inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool + +#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/technology/software/products/berkeley-db/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="OracleDB" +SLOT="4.4" +KEYWORDS="~amd64 ~arm ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="tcl java doc nocxx bootstrap" + +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 + # This patch and sed statement only matter when USE=bootstrap is in effect + # because the build system is regenerated otherwise. + epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch + sed -i \ + -e "s,\(ac_compiler\|\${MAKEFILE_CC}\|\${MAKEFILE_CXX}\|\$CC\)\( *--version\),\1 -dumpversion,g" \ + "${S}"/../dist/configure + + # 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 + + # 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 + + # During bootstrap, libtool etc might not yet be available + if use !bootstrap; then + # 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 + fi +} + +src_compile() { + local myconf="" + + use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly" + + use bootstrap \ + && myconf="${myconf} --disable-cxx" \ + || 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 && has test $FEATURES ; 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=/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 + mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_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 +} -- cgit v1.2.3-65-gdbad