Fixed build failue by removing db3 from AC_CONFIG_SUBDIRS

it is not needed anyway because we are using external db
Package-Manager: portage-2.1.8.3/cvs/Linux i686

3 files changed, 16 insertions, 28 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index 18cfad6de128..2b5efb77d3b5 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/rpm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.110 2010/05/05 20:54:03 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.111 2010/05/05 23:08:10 sochotnicky Exp $
+
+  05 May 2010; Stanislav Ochotnicky <sochotnicky@gentoo.org>
+  files/rpm-4.8.0-autotools.patch:
+  app-arch/rpm: Removed db3 from AC_CONFIG_SUBDIRS
 
 *rpm-4.8.0 (05 May 2010)
 
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 9ee9505dc62f..cf64b4b21515 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -8,7 +8,7 @@ AUX rpm-4.4.6-with-sqlite.patch 517 RMD160 0af724f63b528aabd05f4bcf2d4c4830ebdf9
 AUX rpm-4.4.7-qa-fix-undefined.patch 776 RMD160 895ab185d15c94890ed8f2a34bf4f6b54c8bfb61 SHA1 d16d4a491625d304e96ba85fda982011c9d6d946 SHA256 87a444e00328cd6d78391acdf58ac3ab57fa161241c944df173ac14b2cb025a4
 AUX rpm-4.4.7-qa-implicit-function-to-pointer.patch 604 RMD160 f87086379c28fa878c94dbcd6855af82ee852caf SHA1 61079e3109a41c639015f312603ea43ae49a5bb7 SHA256 a8f12898b8ddba5d7dcc70c1128a2b27dd729c7fe2247450cca068bfa68f1d65
 AUX rpm-4.4.7-stupidness.patch 5268 RMD160 631f1bf3dc4553e27dec4a901fa84e17ffc7c7c9 SHA1 e957a9a549fa1ec52b449b1e8fc3ea14af7b7a09 SHA256 e563657e648e9b5ecfc0a653d7515f93db7785ec6867c81591663213965c0850
-AUX rpm-4.8.0-autotools.patch 1296 RMD160 d099b5ea3eac326bc38355c12eae24c011c41f6e SHA1 450879394e1b101b55853051f355babb900c1faa SHA256 a176b4413242170d02dea0c2a4ba05a642d03aa7329aa43f1c8984ff7e580a4b
+AUX rpm-4.8.0-autotools.patch 929 RMD160 9b4b1b08e38f79522a5b1e6ab487ed89b8234add SHA1 f20c1d98d325efa64f54b046cda6a8b5d4463da4 SHA256 2280de624d171399bb48dd4ae9144063ae4ab17f87e57313ba664a234a90e512
 AUX rpm-4.8.0-db-path.patch 628 RMD160 cee347c45bbbebd724dd1346bd74b3344b6a7d06 SHA1 08c3aa65104db74c9851911970711b2f503dfcc8 SHA256 791682c72dd3a24e5e8268bfa967412035aa135c7b8d4673541bed129b89a0f3
 DIST rpm-4.4.6.tar.gz 17157249 RMD160 6b433d20a63fb2542244ae62eff0a8b5fe290439 SHA1 33221f95189671d1a083b4f140bcf9a88ecd4374 SHA256 1e1da50af2b9dfe34c79315eae7520e7e57087671e17ce26107d779ae2b0b595
 DIST rpm-4.4.7.tar.gz 14125623 RMD160 9002eb0fe1d680d8bff447d6918f9726c9a4e34c SHA1 b119fb0f10fd5e2eb330ba547b6a89e40f3c0e68 SHA256 18fde4195e4ac21a4290327336948f8c4fc58a680395edbb5f2f31bae67b18b5
@@ -19,5 +19,5 @@ EBUILD rpm-4.4.6-r7.ebuild 3165 RMD160 0cdc36998e3929662e978ffe71dfa44ed5da3ee4
 EBUILD rpm-4.4.7-r4.ebuild 3083 RMD160 c5c835de374335f3cd2847aaf1a72d07e1fba37a SHA1 b183ebe5f6ffa6979045b2f406772a76de13cc43 SHA256 f0204575b60ef2e97963d1951f43869e4c7814a99b64ac1980453ead7e737022
 EBUILD rpm-4.8.0.ebuild 2142 RMD160 e2f8414d9f8e2bfa8f1adf0b46163b8fd96c8cbf SHA1 e2bc29bbe79957b6edc900035b4d11dabc6457bf SHA256 ce70d2e5ecc751e3f01e51b297c5d2664ba5510053925ad58d87ced7e2cade70
 EBUILD rpm-5.1.6.ebuild 2946 RMD160 ceba21a3805e60ac63e12046eeaa58d4961f21a6 SHA1 e9d8c000729f4fca443904a9859864a13546acfe SHA256 c5dfd0023beffbedd16248aa27a439bc53ff22abc9f89d804480a0fe6b5a372f
-MISC ChangeLog 17002 RMD160 1118575a33f060045aea987e9bc77d44224344a4 SHA1 24174c16d9ad63057e8af1907f0a9282ad51665d SHA256 1aa6da99e9d0e52625aca02e39c1da247450df2bd5cf503d2d2ce1088b985353
+MISC ChangeLog 17150 RMD160 b857d9626d46fca4a95c857511c033afc6d1931e SHA1 97b16e53edb9632797c2b1d26bad275867d7e316 SHA256 5a41c29dbb94dcbac105ece425b50588342d3400ee9c8abcce14b015eb9def8a
 MISC metadata.xml 519 RMD160 761d6ea5d6d764173cdef29d7dbc8675691d29ea SHA1 40a64cdad07d5b80a51b08018c2918c9bc1ce5dc SHA256 f53fa593c136c4fddaaf24fc45f4af887eb25708bc3cc0f8f3e0de5ff3b904ed
diff --git a/app-arch/rpm/files/rpm-4.8.0-autotools.patch b/app-arch/rpm/files/rpm-4.8.0-autotools.patch
index d4016be824ab..21cf254b91b7 100644
--- a/app-arch/rpm/files/rpm-4.8.0-autotools.patch
+++ b/app-arch/rpm/files/rpm-4.8.0-autotools.patch
@@ -1,18 +1,5 @@
-diff --git a/Makefile.am b/Makefile.am
-index 587cfa7..498abfb 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -177,7 +177,7 @@ EXTRA_DIST += rpmpopt.in
- 
- usrsrcdir = $(prefix)/src
- 
--rpmvardir = $(localstatedir)/lib/rpm
-+rpmvardir = $(localstatedir)/rpm
- rpmvar_DATA =
- 
- install-exec-hook:
 diff --git a/configure.ac b/configure.ac
-index 8c2ef50..1ec8978 100644
+index 8c2ef50..2fc75f3 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -305,14 +305,9 @@ AM_CONDITIONAL(LIBDWARF,[test "$WITH_LIBDWARF" = yes])
@@ -33,16 +20,13 @@ index 8c2ef50..1ec8978 100644
  AC_SUBST(WITH_NSS_INCLUDE)
  AC_SUBST(WITH_NSS_LIB)
  
-diff --git a/macros.in b/macros.in
-index ae46fcb..213b53c 100644
---- a/macros.in
-+++ b/macros.in
-@@ -155,7 +155,7 @@
- %_bzip2bin		%{__bzip2}
+@@ -1014,9 +1009,6 @@ AC_SUBST(RPMCONFIGDIR)
+ 
+ AC_SUBST(OBJDUMP)
  
- #	The location of the rpm database file(s).
--%_dbpath		%{_var}/lib/rpm
-+%_dbpath		%{_var}/rpm
+-if test "$with_external_db" = no; then
+-    AC_CONFIG_SUBDIRS(db3)
+-fi
  
- #	The location of the rpm database file(s) after "rpm --rebuilddb".
- %_dbpath_rebuild	%{_dbpath}
+ AM_CONDITIONAL([WITH_INTERNAL_DB],[test "$with_external_db" = no])
+ AM_CONDITIONAL([DOXYGEN],[test "$DOXYGEN" != no])