Disable static libraries. Remove libtool archives. Use eapi4 on 3 series ebuild. Remove overshadowed versions.

Package-Manager: portage-2.2.0_alpha54/cvs/Linux x86_64
RepoMan-Options: --force

11 files changed, 55 insertions, 657 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index 9992285c8e48..c104baeaaf50 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-db/sqlite
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.387 2011/09/03 17:17:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.388 2011/09/09 18:15:04 scarabeus Exp $
+
+*sqlite-3.7.7.1-r1 (09 Sep 2011)
+*sqlite-2.8.16-r5 (09 Sep 2011)
+
+  09 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -sqlite-2.8.16-r4.ebuild, +sqlite-2.8.16-r5.ebuild,
+  -files/sqlite-3.6.22-dlopen.patch,
+  -files/sqlite-3.6.22-interix-fixes-amalgamation.patch, -sqlite-3.7.5.ebuild,
+  -files/sqlite-3.7.5-SQLITE_OMIT_WAL.patch, -files/sqlite-3.7.5-utimes.patch,
+  -sqlite-3.7.6.ebuild, -sqlite-3.7.6.2.ebuild, -sqlite-3.7.6.3.ebuild,
+  +sqlite-3.7.7.1-r1.ebuild:
+  Disable static libraries. Remove libtool archives. Use eapi4 on 3 series
+  ebuild. Remove overshadowed versions.
 
   03 Sep 2011; Raúl Porcel <armin76@gentoo.org> sqlite-3.7.7.1.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #372745
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 1b6d7122bf01..ec74a063d21f 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -4,37 +4,30 @@ Hash: SHA1
 AUX maketcllib.sh 879 RMD160 6d9a0e79a79d5a2efd6074e6b439d4634600980e SHA1 d5bb6054d3c9a4132c92bd8c172a547bf2cc9d85 SHA256 e101ed11d908bfb7f57519a99674160b0273d6500d191f758f8a0d1e6ed78120
 AUX sqlite-2.8.15-alignement-fix.patch 538 RMD160 12407bbe5f1bcae243d4247b43bf63ce0e8becea SHA1 d67a8bb2de26b1d6b7222175bd7f69d28afffb1e SHA256 f61f2f36fed61438d13dbb09902078ef11f0c3e8c8a119f84030689a2f2add8f
 AUX sqlite-2.8.16-multilib.patch 4038 RMD160 0e074a3ebac7c188dbbf9b86be87a79e0c23390a SHA1 8d38fd5820fd1037b35194d33666be19dcce9e98 SHA256 4ccbef245ea50f317e34bad5ed07e6917fc08d718c6e57884255799980d6e765
-AUX sqlite-3.6.22-dlopen.patch 452 RMD160 e9c7e77f3a7410e5b05f17bb6dfacf0270c1e036 SHA1 30adecb66b67ad401aafb56b6277f83bbfd1ea6f SHA256 840d684be229a898838560418d9f152a5c48095f7adce665f7ec75e4ef5c45f9
-AUX sqlite-3.6.22-interix-fixes-amalgamation.patch 717 RMD160 dfae5e2d22cddad5a2d375d4bbce639bc1da805e SHA1 c62fd67d3f32120c86d60299c426199169183107 SHA256 86995c345c3a51e396a4d520031231d7f76384e953829b58f9e9195ccb7a825b
-AUX sqlite-3.7.5-SQLITE_OMIT_WAL.patch 2245 RMD160 76eda21a44ad63f5fab3b9508eda51ed76a1f947 SHA1 4b350d04581f49d72890ddc2db82819383460de6 SHA256 e4647b99b1cfac9576918643e9cb6b66898d02564f4ad832d558f4c46995daa3
-AUX sqlite-3.7.5-utimes.patch 830 RMD160 168a123fedcd50db1141ae32f6bb647349f9e65a SHA1 e6f541f3748a19b8649d4b1e7f496e540128219d SHA256 e25d602aa72c5b607f82900598b61493d556ed202df2c7fe4e15072dd556e6c6
 AUX sqlite-3.7.7.1-interix-amalgamation.patch 564 RMD160 4240fd1db922973a3b196527f5ede63df35afb50 SHA1 59a8863c9194707e2356d94a25e06ca1c08769b1 SHA256 debd37c7f6413c6c1027cd07e5e8a5f3b89c50e15198e3619cdbc266d63ec0dc
 DIST sqlite-2.8.16.tar.gz 981834 RMD160 df60e84f16ccd8b6b8e86dabfe6bf40f6a3dc136 SHA1 7bef329f78628de252c289bda7cea6f86adcc42e SHA256 d26e8a6fac1ad497a3ade719da4f1d6d60f586fd10f66253f1c3d3db7168984e
-DIST sqlite-autoconf-3070500.tar.gz 1551070 RMD160 8bec6a7bfec1c8786dde0586916b0b99e509b2ce SHA1 4e1338497b8da50b84307191bb3418e9ec5715d7 SHA256 cb5b86926ec9f65882b2dddd244f2d620337d911ec73411863f77e48cf6a2f94
-DIST sqlite-autoconf-3070600.tar.gz 1721938 RMD160 81a5f55326c932f8bb9709a305621d54f181cfa7 SHA1 6b17cf7610437706fec6e21f29933c1ffd3a13e0 SHA256 c56417140f32f495827c90565a25c1b1068d1117ae368ea6ab58c01875d78771
-DIST sqlite-autoconf-3070602.tar.gz 1720179 RMD160 dc6998976f3d0e3e8f7b0568966d8ff0cb82c899 SHA1 3582b0b809dc0c3fa10ddaa403c219a4ebd8abb5 SHA256 53aa66f30d8ff87230d4173b7979814432b8084da77fba05992223f76593fc81
-DIST sqlite-autoconf-3070603.tar.gz 1720314 RMD160 dede8ea95e6e92228391750645ad4d628467ce93 SHA1 a19e4496e2854e737d55465b77c87e775a362775 SHA256 bd96d66c8a140776720c028f2eb09d4ff4b0bf9bde2f4f4cb707e26aad873b9a
 DIST sqlite-autoconf-3070701.tar.gz 1748837 RMD160 c86c81ccc3ad1baec6f753090e5ce1d5d9e03f13 SHA1 ee405037ab49f46f657a9b314e66eec6009d5fc6 SHA256 7dcc36b25f7bcbe2938d0ea2baea5b706f0af93473d02a3f612d7ab39e386edf
-DIST sqlite-doc-3070500.zip 3491310 RMD160 2e84f51d7f755af65fd502d64a44e3f7d0ffbd3a SHA1 d103de0bc344dde0153d170af74d56db0437d770 SHA256 812b6846d7a397546936ee8a5662a30bdd1b3b2792571f3f0211a2008cbb71de
-DIST sqlite-doc-3070600.zip 3194145 RMD160 991d59973e9731acec51ee518f60bce45a38a178 SHA1 d203d110f637bd5578f278d9b9ac8675a0631e4a SHA256 2810ed15662904a3eff92914c1298a15221112487a60dd2cb9c76eaf0c1afb02
 DIST sqlite-doc-3070701.zip 3256079 RMD160 11c4a3fa4e53f644970ff487d3ca32e6c001e38b SHA1 6331814cacaad47fb1b940f29740ca6449b365ab SHA256 6d48322b9b22094f6e505b5d530836bb6b43e324251be1959c8bd3f0864e07a0
-DIST sqlite-src-3070500.zip 3987471 RMD160 4d5f2091700e9c183e861613203a1ddb66217c0f SHA1 9706110d635c347e16ddb8cea1b4923385fecfac SHA256 1bb838c02b4946c514e28cfcd1c15b0079f8626f5fbcfcf2b48e2a075acc5c51
-DIST sqlite-src-3070600.zip 4469235 RMD160 d20daa4fe3569ffacfac7364cf163d4409f12c18 SHA1 238247cab076b4df4876970a3e8d1c5b23150062 SHA256 b9f83bf79e997ad649735a0559fbedaf3dbc7312b732e6e67b22d670ac569be6
-DIST sqlite-src-3070602.zip 4469329 RMD160 67d69763c059a9797225261916996503a43357fd SHA1 dfe00d3fd1b346d7ae53acc54a761dcb0d5587eb SHA256 55ec0c95d0eab2de95714c846344f00d0fbc0405dc0d05ab2c80028790996f78
-DIST sqlite-src-3070603.zip 4470530 RMD160 c8c68c6a227dfd8bb13d4768fab53c26ddd25d7b SHA1 33038ecf10b7519d95db797f21c927f5e630784f SHA256 f40dbcfed53853727cec0135b527d209170f8703c1013b24d066a0df9b82cdc9
 DIST sqlite-src-3070701.zip 4562259 RMD160 189d5599712b056f8cf9c763326c568c78cd07f8 SHA1 e30c4de765a1569dc74e2fe12966bc859f4739e5 SHA256 898bfc1cf80c8af26b3107d19db224b457953e8e3ff4bbc69bd70ecb9ab2db39
-EBUILD sqlite-2.8.16-r4.ebuild 2693 RMD160 f0d7c0c813b135e75e32bc5489080d6d32492d17 SHA1 3d8b88705e097b77f4d05104ff47b942afe758d2 SHA256 c691b6a7628a48f1c446fe016970cc0cbde0dd0e0d019d28603b5f54b860c364
-EBUILD sqlite-3.7.5.ebuild 4532 RMD160 18abfd839a28f35c5450dded81bd37b1fff09a65 SHA1 d69414b3fe5f8f07ff6debc51de93ad992eaae87 SHA256 a5c829a4f94720a3ccf7de209648b4b7a38303ad8bbe6fd46b39786de29e3486
-EBUILD sqlite-3.7.6.2.ebuild 4607 RMD160 56c04883de1de0745dd52427a6c2dd4de02f7098 SHA1 f6119998a61d78747fdd9fe2bccdb9b37e6adf2e SHA256 2db1cbd014601f9e97641494a596441f0844a2215e8b9017705a566de7c53294
-EBUILD sqlite-3.7.6.3.ebuild 4596 RMD160 1fa99fa2c21e49c190a4550601c9d3cce800967b SHA1 564fee043d40bce70882510bb3f741ece3a3aa60 SHA256 5c739e6ed87eb5ec15049ec294b94df3c7d794fe147ee5da1ea71fcfbf7a5f98
-EBUILD sqlite-3.7.6.ebuild 4502 RMD160 c6ea1fd15a58d48778220f0cbab730b7e095de10 SHA1 f772db0f3ced29d2552aaea77a679718847e59fb SHA256 47d0f3b535c95e50b61e2e7a7fe5645f451af84565265556c9a07152c0061bb7
+EBUILD sqlite-2.8.16-r5.ebuild 2729 RMD160 531217fdd25e31987ad4803ad18859f7a9fce90e SHA1 7a2c0401bb6f451b9714956739af33578cd61e84 SHA256 c50d6f820b8cce6606d37b37022ba031149a91c94b9d10ee2d8bc5cba3a3588e
+EBUILD sqlite-3.7.7.1-r1.ebuild 4600 RMD160 89b0f0c9bd32dda76eaa257ad259dcb88426f1fc SHA1 baa833ccccdf5c57dcd5253a6a4a1e79bc74128b SHA256 90aaf9a1c6604233643a0be0524cac7cf3aa109c24c70621ad26880ca5c16fea
 EBUILD sqlite-3.7.7.1.ebuild 4650 RMD160 1fc980ef57fe739f1256888e76ba6fc998c24090 SHA1 73793212baf59f87ca5bb1cb6a80e9abf64dffb9 SHA256 1b48b5cf99fc5ce1f9f1cc78ab6a6c963129a02173c1752b11124094313118a2
-MISC ChangeLog 53193 RMD160 d57df4630b5288c20cf45ac7c6f24e5dbc116a33 SHA1 831e418b00e8db0f468dc8f0d58536c9c6b6f331 SHA256 a4b538a8f015b11ba6e8bea2605efcf2f4912c0d0b8154f33f34432ca21f98a2
+MISC ChangeLog 53782 RMD160 66f3f115e159422ca4b17fbf44a4aaf905e566ea SHA1 a1c988ae9f0546b0225fc4557ec3b1e1ffb058aa SHA256 98a63696ff9bdf790366e9a6983a4f25c90bee23738597f163eb9bcb1a82d6b3
 MISC metadata.xml 1011 RMD160 02768455c7a2f2e980fcd51e16105d1a030a69cf SHA1 98ba789e4120f8d0a1e2f49285f6dbf49e0a35d0 SHA256 4b2dc7fa04d3909cac1f4b764daaddb237e5c4f9a05998d7fd04dc42a5775aae
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5iYSQACgkQuQc30/atMkAvUACgvJIBw6hUpnIWygMEZpaFDjDp
-9G8AnR+M7rqnEl9cCBBb4CBdM3jg9SiN
-=vVUq
+iQIcBAEBAgAGBQJOale0AAoJEOSiRoyO7jvoO28QAIFUvRB/dxLa0i2NNs+e0ztm
+WazE6bM1IG0kkxEcn+W6hqWVzhCTFoUsgfdYy2DpPCXvh0vPFLXvk1t63JLuNid8
+J5hJ/TReq867y6ZvekTl92dh3HFedd7du+3sQLnFaFBQ4yAg8M+LIctXmq/81lLz
+V4YtrBiMExJlTkUPdVwHDy5XpOM+hQKFBC3TTTDvkTvzJrsBreGZBlDm2Ryr7JGg
+HrX0eRvm8mdB2bmZ2CMw8HcSbzCDDiH4L7MIMGvEBjdpZr1Kyy7L/TJL2QjFLlu5
+OGIYEY0kdtTeA5ErsqZXg9/9mNB3C8tMsH4fBG1a+JwsH+OMk7781O2hJ7bbONZF
+tWZWaSFgbh2VZ3gfD6+Ow29GnPDpuoEezsUZq/aqam74VnFgB0ri0MrrsMqllTQW
+uPMCrZ3thg2cAjoFxVBqOMsUpRO5yUvlic0SvnJVMA0WNisGKvZgyFp/G2hfUKBe
+NLgY1FfyjEk22A8XfeVEnvNcny6hj/lCKZHcAEJVKbwgHPPcZFu7AKfiVmDiBYNJ
+GcxneavIdstojzj55slyJ3F+AgEflAMR1E8hcFwXLWgHEBHSvUeOWgEY8DiDRbwe
+4HSb5AUEkXqZ+/QpCph2ks4UG2a0v/JcettSFjDRxU+Xq6mc4xK0byuD+/iaxo1p
+68q0BnnG7gr3tf2iF0hh
+=5WWR
 -----END PGP SIGNATURE-----
diff --git a/dev-db/sqlite/files/sqlite-3.6.22-dlopen.patch b/dev-db/sqlite/files/sqlite-3.6.22-dlopen.patch
deleted file mode 100644
index 01375bf85c57..000000000000
--- a/dev-db/sqlite/files/sqlite-3.6.22-dlopen.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru sqlite-3.6.22/configure.ac sqlite-3.6.22.new/configure.ac
---- sqlite-3.6.22/configure.ac	2009-11-16 13:27:54.000000000 -0500
-+++ sqlite-3.6.22.new/configure.ac	2010-01-13 12:21:27.092738446 -0500
-@@ -637,6 +637,7 @@
-       [use_loadextension=$enableval],[use_loadextension=no])
- if test "${use_loadextension}" = "yes" ; then
-   OPT_FEATURE_FLAGS=""
-+  AC_SEARCH_LIBS(dlopen, dl)
- else
-   OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
- fi
diff --git a/dev-db/sqlite/files/sqlite-3.6.22-interix-fixes-amalgamation.patch b/dev-db/sqlite/files/sqlite-3.6.22-interix-fixes-amalgamation.patch
deleted file mode 100644
index cc087a83d100..000000000000
--- a/dev-db/sqlite/files/sqlite-3.6.22-interix-fixes-amalgamation.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- sqlite-3.6.22.orig/sqlite3.c	2010-01-13 22:28:39 -0800
-+++ sqlite-3.6.22/sqlite3.c	2010-01-13 22:36:25 -0800
-@@ -21915,7 +21915,9 @@
-   case ENODEV:
-   case ENXIO:
-   case ENOENT:
-+#ifdef ESTALE
-   case ESTALE:
-+#endif
-   case ENOSYS:
-     /* these should force the client to close the file and reconnect */
-     
-diff -ru sqlite-3.6.22.orig/sqlite3.c sqlite-3.6.22/sqlite3.c
---- sqlite-3.6.22.orig/sqlite3.c	2010-01-14 15:20:11 +0100
-+++ sqlite-3.6.22/sqlite3.c	2010-01-14 15:21:25 +0100
-@@ -23343,7 +23343,7 @@
-     pFile->locktype = locktype;
- #if !OS_VXWORKS
-     /* Always update the timestamp on the old file */
--    utimes(zLockFile, NULL);
-+    utime(zLockFile, NULL);
- #endif
-     return SQLITE_OK;
-   }
diff --git a/dev-db/sqlite/files/sqlite-3.7.5-SQLITE_OMIT_WAL.patch b/dev-db/sqlite/files/sqlite-3.7.5-SQLITE_OMIT_WAL.patch
deleted file mode 100644
index e49585643db8..000000000000
--- a/dev-db/sqlite/files/sqlite-3.7.5-SQLITE_OMIT_WAL.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-http://www.sqlite.org/src/ci/b9b48dd8dd
-
---- src/pager.c
-+++ src/pager.c
-@@ -2851,6 +2851,28 @@
-   return rc;
- }
- 
-+/*
-+** Update the value of the change-counter at offsets 24 and 92 in
-+** the header and the sqlite version number at offset 96.
-+**
-+** This is an unconditional update.  See also the pager_incr_changecounter()
-+** routine which only updates the change-counter if the update is actually
-+** needed, as determined by the pPager->changeCountDone state variable.
-+*/
-+static void pager_write_changecounter(PgHdr *pPg){
-+  u32 change_counter;
-+
-+  /* Increment the value just read and write it back to byte 24. */
-+  change_counter = sqlite3Get4byte((u8*)pPg->pPager->dbFileVers)+1;
-+  put32bits(((char*)pPg->pData)+24, change_counter);
-+
-+  /* Also store the SQLite version number in bytes 96..99 and in
-+  ** bytes 92..95 store the change counter for which the version number
-+  ** is valid. */
-+  put32bits(((char*)pPg->pData)+92, change_counter);
-+  put32bits(((char*)pPg->pData)+96, SQLITE_VERSION_NUMBER);
-+}
-+
- #ifndef SQLITE_OMIT_WAL
- /*
- ** This function is invoked once for each page that has already been 
-@@ -2921,29 +2943,6 @@
-   return rc;
- }
- 
--
--/*
--** Update the value of the change-counter at offsets 24 and 92 in
--** the header and the sqlite version number at offset 96.
--**
--** This is an unconditional update.  See also the pager_incr_changecounter()
--** routine which only updates the change-counter if the update is actually
--** needed, as determined by the pPager->changeCountDone state variable.
--*/
--static void pager_write_changecounter(PgHdr *pPg){
--  u32 change_counter;
--
--  /* Increment the value just read and write it back to byte 24. */
--  change_counter = sqlite3Get4byte((u8*)pPg->pPager->dbFileVers)+1;
--  put32bits(((char*)pPg->pData)+24, change_counter);
--
--  /* Also store the SQLite version number in bytes 96..99 and in
--  ** bytes 92..95 store the change counter for which the version number
--  ** is valid. */
--  put32bits(((char*)pPg->pData)+92, change_counter);
--  put32bits(((char*)pPg->pData)+96, SQLITE_VERSION_NUMBER);
--}
--
- /*
- ** This function is a wrapper around sqlite3WalFrames(). As well as logging
- ** the contents of the list of pages headed by pList (connected by pDirty),
diff --git a/dev-db/sqlite/files/sqlite-3.7.5-utimes.patch b/dev-db/sqlite/files/sqlite-3.7.5-utimes.patch
deleted file mode 100644
index 4e8732926a2a..000000000000
--- a/dev-db/sqlite/files/sqlite-3.7.5-utimes.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -127,7 +127,7 @@
- #########
- # Figure out whether or not we have these functions
- #
--AC_CHECK_FUNCS([usleep fdatasync localtime_r gmtime_r localtime_s])
-+AC_CHECK_FUNCS([usleep utimes fdatasync localtime_r gmtime_r localtime_s])
- 
- #########
- # By default, we use the amalgamation (this may be changed below...)
---- src/os_unix.c
-+++ src/os_unix.c
-@@ -122,6 +122,9 @@
- #ifndef SQLITE_OMIT_WAL
- #include <sys/mman.h>
- #endif
-+#ifndef HAVE_UTIMES
-+#include <utime.h>
-+#endif
- 
- #if SQLITE_ENABLE_LOCKING_STYLE
- # include <sys/ioctl.h>
-@@ -1610,7 +1613,11 @@
-     pFile->eFileLock = eFileLock;
- #if !OS_VXWORKS
-     /* Always update the timestamp on the old file */
-+#ifdef HAVE_UTIMES
-     utimes(zLockFile, NULL);
-+#else
-+    utime(zLockFile, NULL);
-+#endif
- #endif
-     return SQLITE_OK;
-   }
diff --git a/dev-db/sqlite/sqlite-2.8.16-r4.ebuild b/dev-db/sqlite/sqlite-2.8.16-r5.ebuild
index a2af9d3ffbbc..3c23a33daf58 100644
--- a/dev-db/sqlite/sqlite-2.8.16-r4.ebuild
+++ b/dev-db/sqlite/sqlite-2.8.16-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-2.8.16-r4.ebuild,v 1.21 2010/06/26 10:46:54 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-2.8.16-r5.ebuild,v 1.1 2011/09/09 18:15:04 scarabeus Exp $
 
 inherit eutils alternatives toolchain-funcs
 
@@ -69,8 +69,8 @@ src_compile() {
 	fi
 
 	econf ${myconf} \
-		$(use_enable nls utf8) \
-		|| die "econf failed"
+		--disable-static \
+		$(use_enable nls utf8)
 
 	emake all || die "emake all failed"
 
@@ -102,6 +102,8 @@ src_install () {
 
 	make DESTDIR="${D}" install || die "make install failed"
 
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
 	newbin lemon lemon-${SLOT}
 
 	dodoc README VERSION
diff --git a/dev-db/sqlite/sqlite-3.7.5.ebuild b/dev-db/sqlite/sqlite-3.7.5.ebuild
deleted file mode 100644
index 19e80d83eee9..000000000000
--- a/dev-db/sqlite/sqlite-3.7.5.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.7.5.ebuild,v 1.8 2011/03/22 19:56:36 ranger Exp $
-
-EAPI="3"
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
-
-DESCRIPTION="A SQL Database Engine in a C Library"
-HOMEPAGE="http://sqlite.org/"
-SRC_URI="doc? ( http://sqlite.org/${PN}-doc-${MY_PV}.zip )
-	tcl? ( http://sqlite.org/${PN}-src-${MY_PV}.zip )
-	!tcl? (
-		test? ( http://sqlite.org/${PN}-src-${MY_PV}.zip )
-		!test? ( http://sqlite.org/${PN}-autoconf-${MY_PV}.tar.gz )
-	)"
-
-LICENSE="as-is"
-SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc +extensions +fts3 icu +readline secure-delete soundex tcl test +threadsafe unlock-notify"
-
-RDEPEND="icu? ( dev-libs/icu )
-	readline? ( sys-libs/readline )
-	tcl? ( dev-lang/tcl )"
-DEPEND="${RDEPEND}
-	doc? ( app-arch/unzip )
-	tcl? ( app-arch/unzip )
-	test? (
-		app-arch/unzip
-		dev-lang/tcl
-	)"
-
-amalgamation() {
-	use !tcl && use !test
-}
-
-pkg_setup() {
-	if amalgamation; then
-		S="${WORKDIR}/${PN}-autoconf-${MY_PV}"
-	else
-		S="${WORKDIR}/${PN}-src-${MY_PV}"
-	fi
-}
-
-src_prepare() {
-	if amalgamation; then
-		epatch "${FILESDIR}/${PN}-3.6.22-interix-fixes-amalgamation.patch"
-	else
-		epatch "${FILESDIR}/${P}-utimes.patch"
-		epatch "${FILESDIR}/${PN}-3.6.22-dlopen.patch"
-		epatch "${FILESDIR}/${P}-SQLITE_OMIT_WAL.patch"
-	fi
-
-	eautoreconf
-	epunt_cxx
-}
-
-src_configure() {
-	# `configure` from amalgamation tarball doesn't add -DSQLITE_DEBUG or -DNDEBUG flag.
-	if amalgamation; then
-		if use debug; then
-			append-cppflags -DSQLITE_DEBUG
-		else
-			append-cppflags -DNDEBUG
-		fi
-	fi
-
-	# Support column metadata, bug #266651
-	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
-
-	# Support R-trees, bug #257646
-	append-cppflags -DSQLITE_ENABLE_RTREE
-
-	if use icu; then
-		append-cppflags -DSQLITE_ENABLE_ICU
-		if amalgamation; then
-			sed -e "s/LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
-		else
-			sed -e "s/TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
-		fi
-	fi
-
-	# Support FTS3, bug #207701
-	if use fts3; then
-		append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS
-	fi
-
-	# Enable secure_delete pragma by default
-	if use secure-delete; then
-		append-cppflags -DSQLITE_SECURE_DELETE -DSQLITE_CHECK_PAGES -DSQLITE_CORE
-	fi
-
-	# Support soundex, bug #143794
-	if use soundex; then
-		append-cppflags -DSQLITE_SOUNDEX
-	fi
-
-	# Enable unlock notification
-	if use unlock-notify; then
-		append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
-	fi
-
-	local extensions_option
-	if amalgamation; then
-		extensions_option="dynamic-extensions"
-	else
-		extensions_option="load-extension"
-	fi
-
-	# Starting from 3.6.23, SQLite has locking strategies that are specific to
-	# OSX. By default they are enabled, and use semantics that only make sense
-	# on OSX. However, they require gethostuuid() function for that, which is
-	# only available on OSX starting from 10.6 (Snow Leopard). For earlier
-	# versions of OSX we have to disable all this nifty locking options, as
-	# suggested by upstream.
-	if [[ "${CHOST}" == *-darwin[56789] ]]; then
-		append-cppflags -DSQLITE_ENABLE_LOCKING_STYLE="0"
-	fi
-
-	if [[ "${CHOST}" == *-mint* ]]; then
-		append-cppflags -DSQLITE_OMIT_WAL
-	fi
-
-	# `configure` from amalgamation tarball doesn't support
-	# --with-readline-inc and --(enable|disable)-tcl options.
-	econf \
-		$(use_enable extensions ${extensions_option}) \
-		$(use_enable readline) \
-		$(use_enable threadsafe) \
-		$(amalgamation || echo --with-readline-inc="-I${EPREFIX}/usr/include/readline") \
-		$(amalgamation || use_enable debug) \
-		$(amalgamation || echo --enable-tcl)
-}
-
-src_compile() {
-	emake TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" || die "emake failed"
-}
-
-src_test() {
-	if [[ "${EUID}" -eq "0" ]]; then
-		ewarn "Skipping tests due to root permissions"
-		return
-	fi
-
-	local test="test"
-	use debug && test="fulltest"
-	emake ${test} || die "Test failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install || die "emake install failed"
-	doman sqlite3.1 || die "doman failed"
-
-	if use doc; then
-		dohtml -r "${WORKDIR}/${PN}-doc-${MY_PV}/"* || die "dohtml failed"
-	fi
-}
diff --git a/dev-db/sqlite/sqlite-3.7.6.3.ebuild b/dev-db/sqlite/sqlite-3.7.6.3.ebuild
deleted file mode 100644
index 0209890696fd..000000000000
--- a/dev-db/sqlite/sqlite-3.7.6.3.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.7.6.3.ebuild,v 1.7 2011/08/07 14:29:51 armin76 Exp $
-
-EAPI="3"
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
-DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
-
-DESCRIPTION="A SQL Database Engine in a C Library"
-HOMEPAGE="http://sqlite.org/"
-SRC_URI="doc? ( http://sqlite.org/${PN}-doc-${DOC_PV}.zip )
-	tcl? ( http://sqlite.org/${PN}-src-${SRC_PV}.zip )
-	!tcl? (
-		test? ( http://sqlite.org/${PN}-src-${SRC_PV}.zip )
-		!test? ( http://sqlite.org/${PN}-autoconf-${SRC_PV}.tar.gz )
-	)"
-
-LICENSE="as-is"
-SLOT="3"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc +extensions +fts3 icu +readline secure-delete soundex tcl test +threadsafe unlock-notify"
-
-RDEPEND="icu? ( dev-libs/icu )
-	readline? ( sys-libs/readline )
-	tcl? ( dev-lang/tcl )"
-DEPEND="${RDEPEND}
-	doc? ( app-arch/unzip )
-	tcl? ( app-arch/unzip )
-	test? (
-		app-arch/unzip
-		dev-lang/tcl
-	)"
-
-amalgamation() {
-	use !tcl && use !test
-}
-
-pkg_setup() {
-	if amalgamation; then
-		S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
-	else
-		S="${WORKDIR}/${PN}-src-${SRC_PV}"
-	fi
-}
-
-src_prepare() {
-	if amalgamation; then
-		epatch "${FILESDIR}/${PN}-3.6.22-interix-fixes-amalgamation.patch"
-	else
-		epatch "${FILESDIR}/${PN}-3.7.5-utimes.patch"
-		epatch "${FILESDIR}/${PN}-3.6.22-dlopen.patch"
-	fi
-
-	eautoreconf
-	epunt_cxx
-}
-
-src_configure() {
-	# `configure` from amalgamation tarball doesn't add -DSQLITE_DEBUG or -DNDEBUG flag.
-	if amalgamation; then
-		if use debug; then
-			append-cppflags -DSQLITE_DEBUG
-		else
-			append-cppflags -DNDEBUG
-		fi
-	fi
-
-	# Support column metadata, bug #266651
-	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
-
-	# Support R-trees, bug #257646
-	append-cppflags -DSQLITE_ENABLE_RTREE
-
-	if use icu; then
-		append-cppflags -DSQLITE_ENABLE_ICU
-		if amalgamation; then
-			sed -e "s/LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
-		else
-			sed -e "s/TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
-		fi
-	fi
-
-	# Support FTS3, bug #207701
-	if use fts3; then
-		append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS
-	fi
-
-	# Enable secure_delete pragma by default
-	if use secure-delete; then
-		append-cppflags -DSQLITE_SECURE_DELETE -DSQLITE_CHECK_PAGES -DSQLITE_CORE
-	fi
-
-	# Support soundex, bug #143794
-	if use soundex; then
-		append-cppflags -DSQLITE_SOUNDEX
-	fi
-
-	# Enable unlock notification
-	if use unlock-notify; then
-		append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
-	fi
-
-	local extensions_option
-	if amalgamation; then
-		extensions_option="dynamic-extensions"
-	else
-		extensions_option="load-extension"
-	fi
-
-	# Starting from 3.6.23, SQLite has locking strategies that are specific to
-	# OSX. By default they are enabled, and use semantics that only make sense
-	# on OSX. However, they require gethostuuid() function for that, which is
-	# only available on OSX starting from 10.6 (Snow Leopard). For earlier
-	# versions of OSX we have to disable all this nifty locking options, as
-	# suggested by upstream.
-	if [[ "${CHOST}" == *-darwin[56789] ]]; then
-		append-cppflags -DSQLITE_ENABLE_LOCKING_STYLE="0"
-	fi
-
-	if [[ "${CHOST}" == *-mint* ]]; then
-		append-cppflags -DSQLITE_OMIT_WAL
-	fi
-
-	# `configure` from amalgamation tarball doesn't support
-	# --with-readline-inc and --(enable|disable)-tcl options.
-	econf \
-		$(use_enable extensions ${extensions_option}) \
-		$(use_enable readline) \
-		$(use_enable threadsafe) \
-		$(amalgamation || echo --with-readline-inc="-I${EPREFIX}/usr/include/readline") \
-		$(amalgamation || use_enable debug) \
-		$(amalgamation || echo --enable-tcl)
-}
-
-src_compile() {
-	emake TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" || die "emake failed"
-}
-
-src_test() {
-	if [[ "${EUID}" -eq "0" ]]; then
-		ewarn "Skipping tests due to root permissions"
-		return
-	fi
-
-	local test="test"
-	use debug && test="fulltest"
-	emake ${test} || die "Test failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install || die "emake install failed"
-	doman sqlite3.1 || die "doman failed"
-
-	if use doc; then
-		dohtml -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"* || die "dohtml failed"
-	fi
-}
diff --git a/dev-db/sqlite/sqlite-3.7.6.ebuild b/dev-db/sqlite/sqlite-3.7.6.ebuild
deleted file mode 100644
index 061f2267cc54..000000000000
--- a/dev-db/sqlite/sqlite-3.7.6.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.7.6.ebuild,v 1.1 2011/04/12 16:46:08 arfrever Exp $
-
-EAPI="3"
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
-
-DESCRIPTION="A SQL Database Engine in a C Library"
-HOMEPAGE="http://sqlite.org/"
-SRC_URI="doc? ( http://sqlite.org/${PN}-doc-${MY_PV}.zip )
-	tcl? ( http://sqlite.org/${PN}-src-${MY_PV}.zip )
-	!tcl? (
-		test? ( http://sqlite.org/${PN}-src-${MY_PV}.zip )
-		!test? ( http://sqlite.org/${PN}-autoconf-${MY_PV}.tar.gz )
-	)"
-
-LICENSE="as-is"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc +extensions +fts3 icu +readline secure-delete soundex tcl test +threadsafe unlock-notify"
-
-RDEPEND="icu? ( dev-libs/icu )
-	readline? ( sys-libs/readline )
-	tcl? ( dev-lang/tcl )"
-DEPEND="${RDEPEND}
-	doc? ( app-arch/unzip )
-	tcl? ( app-arch/unzip )
-	test? (
-		app-arch/unzip
-		dev-lang/tcl
-	)"
-
-amalgamation() {
-	use !tcl && use !test
-}
-
-pkg_setup() {
-	if amalgamation; then
-		S="${WORKDIR}/${PN}-autoconf-${MY_PV}"
-	else
-		S="${WORKDIR}/${PN}-src-${MY_PV}"
-	fi
-}
-
-src_prepare() {
-	if amalgamation; then
-		epatch "${FILESDIR}/${PN}-3.6.22-interix-fixes-amalgamation.patch"
-	else
-		epatch "${FILESDIR}/${PN}-3.7.5-utimes.patch"
-		epatch "${FILESDIR}/${PN}-3.6.22-dlopen.patch"
-	fi
-
-	eautoreconf
-	epunt_cxx
-}
-
-src_configure() {
-	# `configure` from amalgamation tarball doesn't add -DSQLITE_DEBUG or -DNDEBUG flag.
-	if amalgamation; then
-		if use debug; then
-			append-cppflags -DSQLITE_DEBUG
-		else
-			append-cppflags -DNDEBUG
-		fi
-	fi
-
-	# Support column metadata, bug #266651
-	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
-
-	# Support R-trees, bug #257646
-	append-cppflags -DSQLITE_ENABLE_RTREE
-
-	if use icu; then
-		append-cppflags -DSQLITE_ENABLE_ICU
-		if amalgamation; then
-			sed -e "s/LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
-		else
-			sed -e "s/TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
-		fi
-	fi
-
-	# Support FTS3, bug #207701
-	if use fts3; then
-		append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS
-	fi
-
-	# Enable secure_delete pragma by default
-	if use secure-delete; then
-		append-cppflags -DSQLITE_SECURE_DELETE -DSQLITE_CHECK_PAGES -DSQLITE_CORE
-	fi
-
-	# Support soundex, bug #143794
-	if use soundex; then
-		append-cppflags -DSQLITE_SOUNDEX
-	fi
-
-	# Enable unlock notification
-	if use unlock-notify; then
-		append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
-	fi
-
-	local extensions_option
-	if amalgamation; then
-		extensions_option="dynamic-extensions"
-	else
-		extensions_option="load-extension"
-	fi
-
-	# Starting from 3.6.23, SQLite has locking strategies that are specific to
-	# OSX. By default they are enabled, and use semantics that only make sense
-	# on OSX. However, they require gethostuuid() function for that, which is
-	# only available on OSX starting from 10.6 (Snow Leopard). For earlier
-	# versions of OSX we have to disable all this nifty locking options, as
-	# suggested by upstream.
-	if [[ "${CHOST}" == *-darwin[56789] ]]; then
-		append-cppflags -DSQLITE_ENABLE_LOCKING_STYLE="0"
-	fi
-
-	if [[ "${CHOST}" == *-mint* ]]; then
-		append-cppflags -DSQLITE_OMIT_WAL
-	fi
-
-	# `configure` from amalgamation tarball doesn't support
-	# --with-readline-inc and --(enable|disable)-tcl options.
-	econf \
-		$(use_enable extensions ${extensions_option}) \
-		$(use_enable readline) \
-		$(use_enable threadsafe) \
-		$(amalgamation || echo --with-readline-inc="-I${EPREFIX}/usr/include/readline") \
-		$(amalgamation || use_enable debug) \
-		$(amalgamation || echo --enable-tcl)
-}
-
-src_compile() {
-	emake TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" || die "emake failed"
-}
-
-src_test() {
-	if [[ "${EUID}" -eq "0" ]]; then
-		ewarn "Skipping tests due to root permissions"
-		return
-	fi
-
-	local test="test"
-	use debug && test="fulltest"
-	emake ${test} || die "Test failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install || die "emake install failed"
-	doman sqlite3.1 || die "doman failed"
-
-	if use doc; then
-		dohtml -r "${WORKDIR}/${PN}-doc-${MY_PV}/"* || die "dohtml failed"
-	fi
-}
diff --git a/dev-db/sqlite/sqlite-3.7.6.2.ebuild b/dev-db/sqlite/sqlite-3.7.7.1-r1.ebuild
index ef48bc51b5d1..4dbc8a34b0d0 100644
--- a/dev-db/sqlite/sqlite-3.7.6.2.ebuild
+++ b/dev-db/sqlite/sqlite-3.7.7.1-r1.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.7.6.2.ebuild,v 1.1 2011/04/18 18:45:26 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.7.7.1-r1.ebuild,v 1.1 2011/09/09 18:15:04 scarabeus Exp $
 
-EAPI="3"
+EAPI=4
 
-inherit autotools eutils flag-o-matic multilib versionator
+inherit eutils flag-o-matic multilib versionator autotools
 
 SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
-DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
+# DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
+DOC_PV="${SRC_PV}"
 
 DESCRIPTION="A SQL Database Engine in a C Library"
 HOMEPAGE="http://sqlite.org/"
@@ -48,13 +49,12 @@ pkg_setup() {
 
 src_prepare() {
 	if amalgamation; then
-		epatch "${FILESDIR}/${PN}-3.6.22-interix-fixes-amalgamation.patch"
-	else
-		epatch "${FILESDIR}/${PN}-3.7.5-utimes.patch"
-		epatch "${FILESDIR}/${PN}-3.6.22-dlopen.patch"
+		epatch "${FILESDIR}"/${P}-interix-amalgamation.patch
 	fi
 
-	eautoreconf
+	# at least x86-interix, ppc-aix and *-solaris need this to catch a new(er)
+	# libtool, as the shipped one lacks some platform support.
+	use prefix && eautoreconf
 	epunt_cxx
 }
 
@@ -127,6 +127,7 @@ src_configure() {
 	# `configure` from amalgamation tarball doesn't support
 	# --with-readline-inc and --(enable|disable)-tcl options.
 	econf \
+		--disable-static \
 		$(use_enable extensions ${extensions_option}) \
 		$(use_enable readline) \
 		$(use_enable threadsafe) \
@@ -136,7 +137,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" || die "emake failed"
+	emake TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
 }
 
 src_test() {
@@ -147,14 +148,15 @@ src_test() {
 
 	local test="test"
 	use debug && test="fulltest"
-	emake ${test} || die "Test failed"
+	emake ${test}
 }
 
 src_install() {
-	emake DESTDIR="${D}" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install || die "emake install failed"
-	doman sqlite3.1 || die "doman failed"
+	emake DESTDIR="${D}" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
 
-	if use doc; then
-		dohtml -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"* || die "dohtml failed"
-	fi
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	doman sqlite3.1
+
+	use doc && dohtml -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"*
 }