Remove java useflag for old db-3.2.9-r11 version. People using the bindings would...

Package-Manager: portage-2.1.4.3

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index d26258e39f9bdd224dcc0bf5973509976ad3f86c..816b4b1cde2d30cad547b07d4a3473d9022efd1b 100644 (file)
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,11 @@
 # 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.232 2008/01/05 11:57:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.233 2008/02/12 09:59:54 pauldv Exp $
+
+  12 Feb 2008; <paul@gentoo.org> db-3.2.9-r11.ebuild:
+  The java useflag actually fails because of db's way to find the headers (bug
+  #207164). As the lack of reports indicates that people don't use it. The
+  useflag is disabled for now on this old version of db.
 
   05 Jan 2008; Raúl Porcel <armin76@gentoo.org> db-4.3.29-r2.ebuild:
   Add ~alpha wrt #204213

diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index b21a4b8215b4c256cb5e573fe6eac37d86586e3d..b6e91991a25702f95f0639b74005bbc59456f607 100644 (file)
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -46,12 +46,12 @@ DIST patch.4.5.20.2 1752 RMD160 d35069e8267f02e64e6f1be046d6cb9e75e9e720 SHA1 a3
 EBUILD db-1.85-r1.ebuild 1430 RMD160 f3aea6863179125dcf307d4d91d16d0695d5dba5 SHA1 84f2748d45073119a9a6bee32aa7ef9b7e2c44b6 SHA256 0e22ffc8fe20072f24f893e4cc0088e8ebb16c30820572635b69d3b8b626527a
 EBUILD db-1.85-r3.ebuild 1208 RMD160 0d32ed21d66ec80e61513657f1e6c41c77393bcf SHA1 cdd8e85f25f474feb1985afdc1d8b358afea4d9d SHA256 651e8a948b48eef3ae3e426ee512cf22690c74ee39c6be2a02f9a3d6346b4f41
 EBUILD db-3.2.9-r10.ebuild 4397 RMD160 033e5f228e9e6d4153a44f860c8f3bfc51d9c12c SHA1 ac78a45e38e857d37975a7ce3ae100a024acc2f4 SHA256 310f7e78c1eadc058ccdd7a3968b48b2c1822b6f19a95df69189e2b406c667a3
-EBUILD db-3.2.9-r11.ebuild 4675 RMD160 33b0ac196665c9474ed0ba0f6e10019d9049b17f SHA1 3a7b744f48061d18303f041a27dd85427b12aa12 SHA256 6e300b35b0cd0a147459e00fb16054686f38eb9c8ef464fc670322ba116b9018
+EBUILD db-3.2.9-r11.ebuild 4426 RMD160 f12b4d5c60621af1732f4adeabee102ca34d471c SHA1 ee22026976e5e95e2a5929624aeffbbf88ad2014 SHA256 f96ca2023c5727de2c9cfef3efdb58d9279343062f7fe5ea81e5932d11f5f605
 EBUILD db-4.2.52_p4-r2.ebuild 3486 RMD160 44cc9d42c0a9fa881add37c72a006f8013317d82 SHA1 b61e53bf1a4ca1cdacc9305d3183d42cb995b1d8 SHA256 0cdd68173cdb1a1b719675b99b050b533077674a860183c038a0cb55211e1387
 EBUILD db-4.3.29-r2.ebuild 3717 RMD160 5645a9f0748f6b6a408dbbd3e42b418442ad6b64 SHA1 c0809033a10aad3122dd9919fcc8eb96c3a70614 SHA256 5a6ab33d110c3bc15d63fb619de97fcb94a18c6fdf5298b9b7d7474093a5c3cb
 EBUILD db-4.4.20_p4.ebuild 3676 RMD160 7b63df1a310b1f7ee375298855fd5cc2bab6151f SHA1 a746d67be608c033b24bc8c5dd1b23dbf1ff9807 SHA256 4dd5dc3e2462970a0bd19ff601607181ed203a089dca9bcabb45b60baa516fd2
 EBUILD db-4.5.20_p2.ebuild 3925 RMD160 fcd3e822554999ec483801256a8bd604800e9ec2 SHA1 141edd2e8ef34da7d2284e6226e1bdc579f0d247 SHA256 dc8c46df080130953702cbe59a473bc178c0c192ca6d2de01566b8c02891bccd
 EBUILD db-4.6.19.ebuild 3938 RMD160 9fc00d58a793ba388a84b91f423e84a9d7dbdee5 SHA1 1b989d2ef22b29ff24de0466438be027d4627ed5 SHA256 b02f92bf555c84949b219db80bca55b35d7a66952c2a6f728dc74898672c865a
 EBUILD db-4.6.21.ebuild 3938 RMD160 8d7df2bb21d740d0da7bcd60c1f9edcb7dec4338 SHA1 cbc5fb34a2b079c16e97d09a3104143d124f19e7 SHA256 e4677cca7003cf0913f7adbd09b3d834b517e80c2ad339ee305f7e7cd51e96bb
-MISC ChangeLog 35190 RMD160 453543a0d7e0539461ad54c761787acbfe5ece85 SHA1 f596be00e48bd06144ebafc98434676061f9afcf SHA256 0d47bd8fa36fed40e7280c2738eff7d7f6ed892016e0a8e5c7b2ec518b7999e9
+MISC ChangeLog 35455 RMD160 4723c0c6ebe04772aa3c2a6b412c9a3946c5f6e9 SHA1 e4726bbd42984cea3fc382be4d3ba231143b1614 SHA256 85dfe4d15cd0e896cf59e954b9cc20221588a23b9975ce54c45940afca7ab334
 MISC metadata.xml 1651 RMD160 cbdc138b8fd0fab28ec59db03fca18f2e0e74818 SHA1 e70ae3f07e5559a43dd85fad3270b7f7f185b996 SHA256 895bfb43a1bd60170937b4523f396d5772a3914384a95105345ac1f24c606550

diff --git a/sys-libs/db/db-3.2.9-r11.ebuild b/sys-libs/db/db-3.2.9-r11.ebuild
index 2175283038c76fe360f39a3c50bd1df50a294d6b..da0270f865b11cecb12ec4d7139a5c1e042a1ddd 100644 (file)
--- a/sys-libs/db/db-3.2.9-r11.ebuild
+++ b/sys-libs/db/db-3.2.9-r11.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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-3.2.9-r11.ebuild,v 1.14 2007/10/25 07:03:32 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-3.2.9-r11.ebuild,v 1.15 2008/02/12 09:59:54 pauldv Exp $
 
-inherit gnuconfig libtool eutils db java-pkg-opt-2
+inherit gnuconfig libtool eutils db
 
 DESCRIPTION="Berkeley DB for transaction support in MySQL"
 HOMEPAGE="http://www.sleepycat.com/"
@@ -13,13 +13,12 @@ SLOT="3"
 # This ebuild is to be the compatibility ebuild for when db4 is put
 # in the tree.
 KEYWORDS="~alpha amd64 arm ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="doc java"
+IUSE="doc"
 
 DEPEND="${RDEPEND}
        =sys-libs/db-1.85*
        sys-devel/libtool
-       sys-devel/m4
-       java? ( >=virtual/jre-1.4 )"
+       sys-devel/m4"
 # We need m4 too else build fails without config.guess
 
 # This doesn't build without exceptions
@@ -28,9 +27,6 @@ export CXXFLAGS="${CXXFLAGS/-fno-exceptions/-fexceptions}"
 src_unpack() {
        unpack ${A}
 
-       use java && export JAVACABS=${JAVAC}
-       use java && export JAVACFLAGS=$(java-pkg_javac-args)
-
        chmod -R ug+w *
 
        cd "${WORKDIR}"/${P}
@@ -58,8 +54,6 @@ src_unpack() {
        sed -i "s,\(-D_GNU_SOURCE\),\1 ${CFLAGS}," configure
 
        cd "${S}"
-       epatch "${FILESDIR}"/${P}-jarlocation.patch
-       epatch "${FILESDIR}"/db-3.2.9-java15.patch
        gnuconfig_update
 }
 
@@ -80,7 +74,6 @@ src_compile() {
        # Robin H. Johnson <robbat2@gentoo.org> (18 Oct 2003)
 
        conf_shared="${conf_shared}
-               `use_enable java`
                --enable-dynamic"
 
        # TCL support is also broken