Version bump.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 6bc20b82714277806ad5fbcca482a1ee5bec5df2..2ed1abdb5ceaa02863cab1648531a9d2de703a9f 100644 (file)
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/db
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.300 2010/03/12 20:14:55 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.301 2010/05/03 21:59:12 robbat2 Exp $
+
+*db-4.8.30 (03 May 2010)
+
+  03 May 2010; Robin H. Johnson <robbat2@gentoo.org> +db-4.8.30.ebuild:
+  Version bump.
 
 *db-4.8.26 (12 Mar 2010)
 

diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 4cd6bfb0e6d8d991af0aa0417e1bc2858565b7a5..0a807f5322349293722b5df9428dacd16d4c6d7f 100644 (file)
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -36,6 +36,7 @@ DIST db-4.6.21.tar.gz 11881885 RMD160 ccf9a4b85cc0464b2f3c2f2da29d99328fd4978e S
 DIST db-4.7.25.tar.gz 13124129 RMD160 9a5d8149d61452906c3f1c36f2859a2033c8bc3b SHA1 957c10358df1211e1dc37ea997aadef42117d6a5 SHA256 f14fd96dd38915a1d63dcb94a63fbb8092334ceba6b5060760427096f631263e
 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.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
@@ -77,5 +78,6 @@ EBUILD db-4.7.25_p3.ebuild 4085 RMD160 d286c79e84bd1002718aaa185d4589d22673e35b
 EBUILD db-4.7.25_p4.ebuild 4353 RMD160 ee5995cda8b373e842b92ca365adb7ad03b3b4e6 SHA1 fb05b4c0b7a9223b297f715939837862fa8336e9 SHA256 678b785e6a8f356656dacd7a710b54a380da858c4978d9e413328e6a79800cb6
 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
-MISC ChangeLog 47040 RMD160 7401ee438e46b2d6cfa83098d123a6dbc1e4bc7d SHA1 6b84b1e64410b9604634df571d505a18638e5337 SHA256 32db4f4cf041993e7f91ee8c7c1cbac90e02231226a82d4c3c12e6cb64a9cc49
+EBUILD db-4.8.30.ebuild 4431 RMD160 79ad467c23dd37c895542fd4d1cb1839d1dd16dc SHA1 f6e4a3314c118c72aa1da277e1a8c3382c53dbab SHA256 2265aba0c86de5423f17b2b0db0998d14fdcb65a045e9da968b3ecd9840965d2
+MISC ChangeLog 47155 RMD160 904cf86d5614aa8455c191c65841f435d07e8994 SHA1 5d7ed6d88e8fbf93b2868350807784fb55c981dc SHA256 d2880a483181ed5b7337e2539c301e363c456ff688debb9b064a8f1e0c2192f6
 MISC metadata.xml 1657 RMD160 f474f2ae4512bb017c5f6d344d5d2d1b03dc6b47 SHA1 f24d5b8ab267859ddc9c1ddb0c10992d31809ec9 SHA256 cb82ec7afe1d3df3b38835aa74a6d467f5b31f98a783df9a01396a546acdf044

diff --git a/sys-libs/db/db-4.8.30.ebuild b/sys-libs/db/db-4.8.30.ebuild
new file mode 100644 (file)
index 0000000..f54dc82
--- /dev/null
+++ b/sys-libs/db/db-4.8.30.ebuild
@@ -0,0 +1,161 @@
+# 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-4.8.30.ebuild,v 1.1 2010/05/03 21:59:12 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.8"
+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
+
+       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
+
+       cd "${S}"/../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
+       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=''
+
+       # 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
+
+       cd "${S}"
+       ECONF_SOURCE="${S}"/../dist \
+       STRIP="true" \
+       econf \
+               --enable-compat185 \
+               --enable-o_direct \
+               --without-uniquename \
+               $(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
+}