Remove sqlite2 support.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 25 insertions, 26 deletions

diff --git a/net-im/ekg2/ChangeLog b/net-im/ekg2/ChangeLog
index dadce2b36136..98933a05cc05 100644
--- a/net-im/ekg2/ChangeLog
+++ b/net-im/ekg2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/ekg2
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ChangeLog,v 1.56 2015/05/08 04:26:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ChangeLog,v 1.57 2015/05/21 14:38:52 mgorny Exp $
+
+  21 May 2015; Michał Górny <mgorny@gentoo.org> ekg2-9999.ebuild:
+  Remove sqlite2 support.
 
   08 May 2015; Michał Górny <mgorny@gentoo.org> ekg2-0.3.1-r1.ebuild,
   ekg2-9999.ebuild:
diff --git a/net-im/ekg2/Manifest b/net-im/ekg2/Manifest
index 722c846fda86..cbcf8baa5d24 100644
--- a/net-im/ekg2/Manifest
+++ b/net-im/ekg2/Manifest
@@ -4,25 +4,25 @@ Hash: SHA256
 AUX 0001-Gentoo-use-vendor-dirs-for-perl-modules.patch 786 SHA256 774aadd44164565b198676d87431264b5e10e18af0664dafd1e6fa6f6ac9ac4d SHA512 8156f6a1f29a1a727840223e4d2bf44c9d6f4a544c948094b405f6a22083070bef5e473597bd993d49e51a5bfedeaa942da8d411f8ed9d61988a8341c8b0134b WHIRLPOOL 038c88443d4f3b11730308c6d81ed5db26e22fd2f8b563e49f23d327af7ef2338559fe387b5cb3f729fa6f65f4637deaeecea39d290b41892ff8f7f22da277d7
 DIST ekg2-0.3.1.tar.gz 1704772 SHA256 6ad360f8ca788d4f5baff226200f56922031ceda1ce0814e650fa4d877099c63 SHA512 dc107005f434f9e3011ff2be720b750b09c72fee1f9e1b47dfbf8af8eac1e27b24e028505a0d4928aedd1375a3245e93757410c742ff112ff5dac1e1a4f5a21c WHIRLPOOL 520f2eeb03e3edf3f3a622fcdcd3ca2952c69ac2503c1c5d76af5abdd7bdb12aa216d3ea22539bec2d996f5147bbf0e8198c9cc201677c8a1d2a65cecca0c1a7
 EBUILD ekg2-0.3.1-r1.ebuild 3067 SHA256 c12e38f24b575137bf84f2b2b9de29a76d4aaf707a79f3dbcecfa4812bc78faf SHA512 94cbd57744be779c2c7de1617bb24839c714a5f16026478774d1aa7c048dd805555b6419f88a31fddaf89269e45fe7babd8d74aa3872a30609fb908628d0dec0 WHIRLPOOL e50adcb3390db666a2601288e06da4f8c6e4a66ac2be219aa88bef4a1aeefde23786059f10bf6c01881c28ab1f6419f5aee75b131c6535a8d705933fc6cc3574
-EBUILD ekg2-9999.ebuild 2780 SHA256 ddc38d12bfbefdb95934882e5e1a7293437ee12606e19dc9e02f5613afc5d856 SHA512 6dff3f14363fb478c5a7b58048eb7e8e6caaaaf6efb69008524a75a82de2249d2c7e36bac0817434061cdf453351369476bc85d40bbeb52a79beb749aa5a7ea6 WHIRLPOOL 8f58dfebf95c0ef0f8d266010f93a0c453cd469c943bc1756b47503fb155d1ef05299fe666f4779115d418f982432b44ca85baa65dce926e0d41a2e08c506108
-MISC ChangeLog 4532 SHA256 7ba9726c0d0d35254627bb81fa8e4d55e873544e4e7f95438ce6a1dc9b3a1227 SHA512 148063cf4efc0712617c5f7d2597b21d3a6e428343e653e70b1f277fe28b8f49630c289cf81fa027125a78bd2583d81ebc621f6afb9a63ab96df68cc99dd3cf5 WHIRLPOOL 7660bc0265bc1843d639075d9c6f188a7d1568eaec7a89cc840611511712d1bec3241f7d25b9fc4a2b44274bfea826229e4b3326a386b20ca1a8b283e4e74b47
-MISC metadata.xml 1730 SHA256 e23a36b3eb54c7556c153f1f43cefa0669ecbb9954511eb6b0e52f6bc24be4ad SHA512 f74d4c25f75b3a3f56bdb81d843f4df0f1e4d5176bb4dee49cf6f6eddba5ef250e00982d6bcb2ff024c0ef3ab65467311e08a28471707babe9cf93c7fdc1fe69 WHIRLPOOL 0d974fb38b340d14b0c05219f1ae0c02802c22ccb9498b6f7cc8e3b498a63d5e0ed9cb262102a150b546db9260688a41e6d9698ac94d23535038d17d1a749c4b
+EBUILD ekg2-9999.ebuild 2681 SHA256 264c34857330d680e8a2fa68660531d9b947e0831d76d7cd47ae6723a8d39d3b SHA512 5adc260ea1e6be63e052ab25e801a2c226550cd21c733b9b666af273b00af1476ac1e4c8f15cfa4280d3ee2df9dcae0eb93fa8ec42d2c1a303e9880d4d830913 WHIRLPOOL 58312eb5a7044c2f21e4c5caf5b29de836d8017d7fa45d186107fb51c66e453899d6783be47c775c0d1770d6a9d9a18280caaff3e0c63b3465d6e88fe76fd8d4
+MISC ChangeLog 4627 SHA256 9d09ec2ce253c5ee2e26a7f65b4915ba3594a8fc94f084e4189609a31d720d18 SHA512 4ccaa887d43de6d5934ecf9f368156572c0a3fc28b4d8f2c737aee0cb86732c73f821c28dd03250bcda5a162a2b37013c66794677f1f2fc0e499a983da9715b1 WHIRLPOOL a03fe82c6aa5982bfbb9cce3e5e9b9362420632b5db8b7f068808e8edb6fbf52747c5575d555bdd0edd2c006fc597d248b92aa36d9dd172b1ca66731f3361496
+MISC metadata.xml 1648 SHA256 166f6169e2dd03c135b21617f961f6049f9980a11402ab13f5a3a494ae9d0fb4 SHA512 9b88ed8585e81365b5f3baca100e4e981d22f4617fa4ca27a223df4c9b715c92f73d81f07f05d502ace0b6c1ab05adb5cf1e589414ff2640808858106f165614 WHIRLPOOL ff5f208b0ece541d62e63dc347c6e17c8d12a19d697444b0230a216fe83126677cdf395b4085744f5cecc8bfe0e5c1c098d23d24df62ae96c92619ceeebef9d1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVTDsHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVXe4xXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOIvIQAKahvre4qw76lm16aQGIFzO9
-UZupCn9F7W9JtDlnD06S7/By9XI8MMKtR2bysSQHqvBEv/jAS0L5S00sN+ZIl/aE
-ViOQiVdr0MWqWWQaP0Lo8IT93Yu6Upw0cSlSvVdbvAFLzLcyOyVpV7nuAsoyQcw6
-WGuHMZrL9YWRQ8UjfgEW+7Xn9fSXMvxsugLXI8cPPRYrRUVxCljumPNR3t8z/SHx
-XcZdUbNZ6Gecy2cxA1TILI6BMrj4bW+CXvt1PiF03+nXJLPCzy6rEc1X98j8kXBa
-F8JOAZqX1GOMImy4OYpGAcOkzsbuy0RoIbWUAvA/dbk0Jj2u+NtzIrSkONxCDvps
-7SXu8bYLGS5FQruWkHTYaaDwLvGDK6ye/fDAakA7p8XcMAeKaE6mAgxSrd2muJw9
-AQZj4YrNhN5UAIgulZ/vjT95ZFCmFOnnXwh4TP0l0MsKIYP05hWg4mzxhyPL1Qbo
-JvAriR3AO1V9OVsiv9hcYLclNyDc255Vm2c7mW7EtEuK2GA8qqVZLfFTG5lX2VFh
-drf1K6K21/MsmdqjhzF6Ch33R9WOiOpb0Itmo9fba4YeuWVNY94mItaK+Wi1JthH
-GG2cKgZRH7IaeX8YwLNktIiU2lgFV5s9UUpT5ARyzmYrc8IcpWTQkeV+lXI0KRq7
-dc/M8bw6K8kcKufd/PXd
-=k0m8
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOA1kP/j+yAoOJlWK6HXCT3T8SbeCC
+nI8zXYFo+64jTg/ameUvNt/EOaFwq4qJQWEyh4+So+aNFInJROYevv48U/Q0BrhP
+Pp7Cp/HwVgWkj1MhvR8TQCWrUaEJIb0Eiu/BjLS8Ui5+nUsesRVIAdwim4d54mzL
+nRsngzyxA8pkjt03mKS6DuNYoLcLdaxCArNA0ne+AHaZyS6LnE/T2sm52BlOpGtS
+yPwtsL5rS6l7tYJ1MRn/TixrgssS2VKuCCaBfQGQnJ66uI4AX0op0Ea8Z8nrO9mc
+NEtEjBeQhx6OwlG3Yco0AyD9pXgx08aJhGQdqAE2EwLCMblS+gndvA1q8E4/tFuD
+dKgdzwvRrniIJYN7yGr6iTZLrMUqb1RmwclzYDOcSNDFVUqo0xPWZaeEMdJy5+5k
+g4C+X742HT0FzRg51o6nEm1FIQ0SwQ7ogO0yFBezwHYYdJqWaDdDP9V7KeM3EIoO
+mutWuvuyeFrQ0zGfdnwbNebbOxiBLmAGDSCR5TSD6uUHTQHOfWtNE3NMLA+qbY7U
+/oBzn5s5rFIu4BiOfRt/0kzerIgyOFpm2zAtupMUsu+/TzwtWjeUDbr3zH20+HBb
+RvGlNzhs/J2hDqdJa8eLRxOubxlaNFyXAzgd568kksfmvSHyYUw22PahYVoSFqTl
+G7236Lx0amfUPnJESxQk
+=JLRm
 -----END PGP SIGNATURE-----
diff --git a/net-im/ekg2/ekg2-9999.ebuild b/net-im/ekg2/ekg2-9999.ebuild
index c5b8a5e7915f..0fda858c8603 100644
--- a/net-im/ekg2/ekg2-9999.ebuild
+++ b/net-im/ekg2/ekg2-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ekg2-9999.ebuild,v 1.11 2015/05/08 04:26:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ekg2-9999.ebuild,v 1.12 2015/05/21 14:38:52 mgorny Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="gadu gpm gpg gtk minimal ncurses nls nntp openssl
-	perl python readline rss spell sqlite sqlite2 ssl xmpp unicode zlib"
+	perl python readline rss spell sqlite ssl xmpp unicode zlib"
 
 RDEPEND="dev-libs/glib:2=
 	gadu? ( <net-libs/libgadu-1.12:0= )
@@ -42,9 +42,7 @@ RDEPEND="dev-libs/glib:2=
 	ncurses? ( sys-libs/ncurses:5=[unicode=]
 		gpm? ( sys-libs/gpm:0= )
 		spell? ( app-text/aspell:0= ) )
-	sqlite? (
-		!sqlite2? ( dev-db/sqlite:3= )
-		sqlite2? ( dev-db/sqlite:0= ) )"
+	sqlite? ( dev-db/sqlite:3= )"
 
 DEPEND="${RDEPEND}
 	sys-devel/gettext"
@@ -93,8 +91,7 @@ src_configure() {
 		$(use_enable !minimal sms)
 
 		# sqlite switch
-		$(use_with !sqlite2 sqlite3)
-		$(use_with sqlite2 sqlite)
+		--with-sqlite3
 
 		# optional deps
 		$(use_with gpm)
diff --git a/net-im/ekg2/metadata.xml b/net-im/ekg2/metadata.xml
index 70c61f7364d6..76636a13f8c2 100644
--- a/net-im/ekg2/metadata.xml
+++ b/net-im/ekg2/metadata.xml
@@ -34,6 +34,5 @@
 		<flag name='minimal'>Disable building extra plugins with no additional
 			deps.</flag>
 		<flag name='openssl'>Support encryption in sim plugin, using OpenSSL.</flag>
-		<flag name='sqlite2'>Prefer SQLite2 over SQLite3 (if USE=sqlite is set).</flag>
 	</use>
 </pkgmetadata>