From 97089cdccfbf2c53c5dd71f57e81ab616117d7a2 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Tue, 11 May 2010 08:01:45 +0000 Subject: Bug #313769: version bump. In package.mask still, has test failures. Some false positives due to upstream, but still at least one failure that needs work. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- sys-libs/db/ChangeLog | 9 +- sys-libs/db/Manifest | 4 +- sys-libs/db/db-5.0.21.ebuild | 190 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 201 insertions(+), 2 deletions(-) create mode 100644 sys-libs/db/db-5.0.21.ebuild (limited to 'sys-libs/db') diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog index 666c2793e688..c1037ec4f1f9 100644 --- a/sys-libs/db/ChangeLog +++ b/sys-libs/db/ChangeLog @@ -1,6 +1,13 @@ # 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.302 2010/05/03 23:21:52 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.303 2010/05/11 08:01:45 robbat2 Exp $ + +*db-5.0.21 (11 May 2010) + + 11 May 2010; Robin H. Johnson +db-5.0.21.ebuild: + Bug #313769: version bump. In package.mask still, has test failures. Some + false positives due to upstream, but still at least one failure that needs + work. 03 May 2010; Robin H. Johnson db-4.5.20_p2.ebuild, db-4.5.20_p2-r1.ebuild, db-4.6.21_p4.ebuild: diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest index e65043b57dde..ac2b6060833c 100644 --- a/sys-libs/db/Manifest +++ b/sys-libs/db/Manifest @@ -37,6 +37,7 @@ DIST db-4.7.25.tar.gz 13124129 RMD160 9a5d8149d61452906c3f1c36f2859a2033c8bc3b S DIST db-4.8.24.tar.gz 22900528 RMD160 848895409f81ab17f6f576d10c00a7897e13bc95 SHA1 264b5067b5df6654d5fe1402f8c9c1aa677abf63 SHA256 bcbd9021250d9cb5992a1adf83cc7c9f08de7d5cfe02a25dbef928316bff5c88 DIST db-4.8.26.tar.gz 22898132 RMD160 816ddaf1b90013e6500255ee6b5d0e5acca486d1 SHA1 f39aff01483aa8de2b1864242028f9a21c38c7cd SHA256 f755d15f79cf6fc5a61d94bc3c8cfd3f9cb0ce3d454379d5981c54b326809d41 DIST db-4.8.30.tar.gz 22887305 RMD160 dd2fcd4c9b857a91e2f491fd4fadb0c51b993a9c SHA1 ab36c170dda5b2ceaad3915ced96e41c6b7e493c SHA256 e0491a07cdb21fb9aa82773bbbedaeb7639cbd0e7f96147ab46141e0045db72a +DIST db-5.0.21.tar.gz 29300812 RMD160 957310c66f7be35d07a96a42dce661bea8f97976 SHA1 f852184fdd7d4a0b14e31ec835fd796981f35976 SHA256 061a31a962e992dd1eae5f1e3193241d497a18968e750707526d104b53ab3cc4 DIST db.1.85.tar.gz 270953 RMD160 594253b7e80323cddc92cd7c89934217d403f58b SHA1 ccb057b07761d1b2b34626e748c7392c749d5e6d SHA256 4220d4ddeb77fb57ba2f37c1aa105d561d3ef85a6fb89c79c3edd735d0e193c6 DIST patch.3.2.9.1 2139 RMD160 a018e1e91102c972279ec017e1d87d6d87f99a56 SHA1 34108ae9ce03c40c4d1016e9e54690d5d8fc4135 SHA256 6d89a42ee0be9e47b3e8a42981c65266a556de84bc6281edcf0f977f52547798 DIST patch.3.2.9.2 495 RMD160 c9982844d99e1c78efddcb7b7615c41f6225e6b9 SHA1 c447c089f44c401c174244a7f9f7967522ba92a4 SHA256 61db874796fe8789b0045f456285b27c5b8b7b8902a5e342a115456015716d0e @@ -79,5 +80,6 @@ EBUILD db-4.7.25_p4.ebuild 4353 RMD160 ee5995cda8b373e842b92ca365adb7ad03b3b4e6 EBUILD db-4.8.24.ebuild 4431 RMD160 3ed6aa7cd48f9824bdf8b2cb4f44b5fc48fe887c SHA1 968afb91b4c4eef1fc1ee5745a044d38776d0a2e SHA256 ef5d888687d88dab2aac25234df1c6376343aee7d68b9277254d678f043706e5 EBUILD db-4.8.26.ebuild 4431 RMD160 b5ada7784ee0ff0ecff7bcbd10a72a64abb6271c SHA1 c884f625ead196b4e1afaf428cf394b8008ef4a4 SHA256 ba81971dc4090bc318cdfa6ec02e5dad68693b038a5fa03827f83e677089e5fd EBUILD db-4.8.30.ebuild 4431 RMD160 79ad467c23dd37c895542fd4d1cb1839d1dd16dc SHA1 f6e4a3314c118c72aa1da277e1a8c3382c53dbab SHA256 2265aba0c86de5423f17b2b0db0998d14fdcb65a045e9da968b3ecd9840965d2 -MISC ChangeLog 47335 RMD160 d4fcc13e5d48c6c1f4478c2793dd08b1e4bc2fb9 SHA1 658d15bf897e64ee91b5d88fd8488ab7a62168b0 SHA256 30f09be87003cf2eba7c3a7ab43cc3d2fc52615c224a3b5d7756cdac4b945501 +EBUILD db-5.0.21.ebuild 5168 RMD160 66048fd8f16b68a7702e5c27ab3bece72b1862c2 SHA1 38faccd1c9246703c786c0aa6728a2ed92739909 SHA256 458a000903ae979ca6697f0ce834a83eabf17167617717b4477274887d1c2d64 +MISC ChangeLog 47595 RMD160 334024d016db68ff5ca7e55e032694f97cf8def1 SHA1 b824a16b1ae9984124bc0c3f8f7c2555ecce0008 SHA256 b4dbefa37d73221fae6f59c67b8880e76ca02900359a9aa81ab6c3654c248f87 MISC metadata.xml 1657 RMD160 f474f2ae4512bb017c5f6d344d5d2d1b03dc6b47 SHA1 f24d5b8ab267859ddc9c1ddb0c10992d31809ec9 SHA256 cb82ec7afe1d3df3b38835aa74a6d467f5b31f98a783df9a01396a546acdf044 diff --git a/sys-libs/db/db-5.0.21.ebuild b/sys-libs/db/db-5.0.21.ebuild new file mode 100644 index 000000000000..70a89c82bc52 --- /dev/null +++ b/sys-libs/db/db-5.0.21.ebuild @@ -0,0 +1,190 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-5.0.21.ebuild,v 1.1 2010/05/11 08:01:45 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_BASE="${WORKDIR}/${MY_P}" +S="${S_BASE}/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="5.0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +IUSE="doc java nocxx tcl test" + +# the entire testsuite needs the TCL functionality +DEPEND="tcl? ( >=dev-lang/tcl-8.4 ) + test? ( >=dev-lang/tcl-8.4 ) + java? ( >=virtual/jdk-1.5 ) + >=sys-devel/binutils-2.16.1" +RDEPEND="tcl? ( dev-lang/tcl ) + java? ( >=virtual/jre-1.5 )" + +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.8-libtool.patch + epatch "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch + + # use the includes from the prefix + epatch "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch + epatch "${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch + + # Upstream release script grabs the dates when the script was run, so lets + # end-run them to keep the date the same. + export REAL_DB_RELEASE_DATE="$(awk \ + '/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' \ + "${S_BASE}"/dist/configure)" + sed -r -i \ + -e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \ + "${S_BASE}"/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_BASE}"/dist/Makefile.in + + cd "${S_BASE}"/dist + rm -f aclocal/libtool.m4 + sed -i \ + -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \ + configure.ac + sed -i \ + -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ + aclocal/programs.m4 + AT_M4DIR="aclocal aclocal_java" eautoreconf + # Upstream sucks - they do autoconf and THEN replace the version variables. + . ./RELEASE + for v in \ + DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \ + DB_VERSION_{PATCH,FULL,UNIQUE_NAME,STRING,FULL_STRING} \ + DB_VERSION \ + DB_RELEASE_DATE ; do + local ev="__EDIT_${v}__" + sed -i -e "s/${ev}/${!v}/g" configure + done +} + +src_compile() { + local myconf='' + + # compilation with -O0 fails on amd64, see bug #171231 + if use amd64; then + replace-flags -O0 -O2 + is-flagq -O[s123] || append-flags -O2 + fi + + # use `set` here since the java opts will contain whitespace + set -- + if use java ; then + set -- "$@" \ + --with-java-prefix="${JAVA_HOME}" \ + --with-javac-flags="$(java-pkg_javac-args)" + 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 + + # Bug #270851: test needs TCL support + if use tcl || use test ; then + myconf="${myconf} --enable-tcl" + myconf="${myconf} --with-tcl=/usr/$(get_libdir)" + else + myconf="${myconf} --disable-tcl" + fi + + # sql_compat will cause a collision with sqlite3 + # --enable-sql_compat + cd "${S}" + ECONF_SOURCE="${S_BASE}"/dist \ + STRIP="true" \ + econf \ + --enable-compat185 \ + --enable-dbm \ + --enable-o_direct \ + --without-uniquename \ + --enable-sql \ + --enable-sql_codegen \ + --disable-sql_compat \ + $(use arm && echo --with-mutex=ARM/gcc-assembly) \ + $(use amd64 && echo --with-mutex=x86/gcc-assembly) \ + $(use_enable !nocxx cxx) \ + $(use_enable !nocxx stl) \ + $(use_enable java) \ + ${myconf} \ + $(use_enable test) \ + "$@" + + emake || die "make failed" +} + +src_install() { + emake install DESTDIR="${D}" || 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_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 +} + +src_test() { + # db_repsite is impossible to build, as upstream strips those sources. + # db_repsite is used directly in the setup_site_prog, + # setup_site_prog is called from open_site_prog + # which is called only from tests + egrep -ril \ + 'open_site_prog|setup_site_prog|db_repsite' \ + "${S_BASE}/test" \ + | xargs egrep -l '^# TEST ' \ + | xargs rename .tcl .tcl.DISABLED + + db_src_test +} -- cgit v1.2.3-65-gdbad