diff options
| -rw-r--r-- | net-im/ekg2/ChangeLog | 9 | ||||
| -rw-r--r-- | net-im/ekg2/Manifest | 34 | ||||
| -rw-r--r-- | net-im/ekg2/ekg2-0.3.1-r2.ebuild (renamed from net-im/ekg2/ekg2-0.3.1-r1.ebuild) | 51 | ||||
| -rw-r--r-- | net-im/ekg2/metadata.xml | 7 |
4 files changed, 51 insertions, 50 deletions
diff --git a/net-im/ekg2/ChangeLog b/net-im/ekg2/ChangeLog index 98933a05cc05..7474df7fc4c0 100644 --- a/net-im/ekg2/ChangeLog +++ b/net-im/ekg2/ChangeLog @@ -1,6 +1,13 @@ # 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.57 2015/05/21 14:38:52 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ChangeLog,v 1.58 2015/05/21 16:01:15 mgorny Exp $ + +*ekg2-0.3.1-r2 (21 May 2015) + + 21 May 2015; Michał Górny <mgorny@gentoo.org> +ekg2-0.3.1-r2.ebuild, + -ekg2-0.3.1-r1.ebuild, metadata.xml: + 0.3.1: kill SQLite 2 support, switch to USE=sqlite, bug #548658. Add slot + operators. 21 May 2015; Michał Górny <mgorny@gentoo.org> ekg2-9999.ebuild: Remove sqlite2 support. diff --git a/net-im/ekg2/Manifest b/net-im/ekg2/Manifest index cbcf8baa5d24..bdaec6120997 100644 --- a/net-im/ekg2/Manifest +++ b/net-im/ekg2/Manifest @@ -3,26 +3,26 @@ 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-0.3.1-r2.ebuild 3063 SHA256 6b7467e16709ac4efa995eff2960e438e3d247c8de0b43f8d550e4ab2ad7b0ef SHA512 c49f4e27464aed43e6d32c62637c43c1edf7a4dd8abcc0bae82146448047160c58418bf37f78159d982fe93ddae4bb5e91a90d03bd87bcc43c37e7a6f2d92cdb WHIRLPOOL 34cd6a3e369ead539e2486c106df234e8a13d53be736d8a0813396dad63503448b246ed71cfb3a7638e9ecbf1498ec900c43d5e8cef6dc4c5175da6b98d1daaf 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 +MISC ChangeLog 4859 SHA256 608e48c4c17a87be9326d07e1a1eee13004a21445ca8373fda3c6eba27d14ea8 SHA512 5922bbe40330c239044a0e389c4293cb30c5955e5d979680c2e4bf89de946479281a67f827c0b91e9558c344d88793595f204cdd87b7f27adfbec586408f2cd2 WHIRLPOOL 0b7423f2e337dae904cae0676b4af5f69d6c1920170167866a18f0b5dcb426eb235cd35070e46d614df85a95f9210daef258ca66695b4d812eeffdd87a5fa14a +MISC metadata.xml 1386 SHA256 66d36e91c36fb83b0992ad7bdd83e85fbc8ba12240f25dd21272bfd52122c449 SHA512 e671bbe81438e8b04f1debb4791f7ff630c296a07d8917ad803f3350a91c7a0c7385de18137100dfab794ef3e14fea26a917cee157c4d9ec4f5ca1a55a15cd97 WHIRLPOOL 0939b53e1717eec9784f245b56d377fe0cd7a11ef1976be7b47bac8cb27bd24f5af02da268cb3c1531888e96f430a070e27b97dcb00c099ace98b8d875a048d3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQJ8BAEBCABmBQJVXe4xXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJVXgFMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -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 +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOIVkQAL3AsGS6lA0sqJLd5cWmgEZr +fjL72E8fveE3jDmjV4ZNwnPzyC45UgDhyS3uyZ1kEQmqednrkqUB/yTr/5dLaZQg +tO2snoFdwxxtcfmA16DOPaydoY37TBI/7WwjmuJSuzB9waEpr1+Fyv+HyE17W1G1 +FEfK9JtB4CiIiep37xte4tFP4uPSe1KGf0ZkXv5VMhA6WyuYxdJGDkIfSHzwgDA+ +8TWhEABsJB6jGu6ReE9A3FNs+3rXmy7JCvT3xwFjhyV30jaDIO/pK8Fe0vCX1LbV +G5vesrO39w07dzkEkboLcONZSWLWySmi82FguuI9hY0ZT4HsRbKFpx8n61yLWJP5 +KzZib369WisnQRFbUPNPvUvSHGJbeTXhVxGswcLGMR4iqpkIbGdCI7jgfB48/NwY +INy3yy7yPu/2OnprJWli4puqajD4BEWvH9KQAxiwly5LjpLZRI6nNlq4NtGKNd6y +6n57lPcoXtIBtcjpZCjqC5Ld3AmIl8u1dp22b+0E8PQ5NCvhO/Li3LJWevcL0Qko +it5BBZAbvpPyeeNLIr18xRmaODCaR7lxV0DIwcRTIYmtq0zcYsU9+Eq3JWwhqN8Z +gPMlfRXoe5/JF2ypwT9fg57vwx6vn0vX87Sa99dZTw/KT5bU/TuwhB/fIM0LVDQb +D/zjv+AItnNDWDepgp7c +=S6Yn -----END PGP SIGNATURE----- diff --git a/net-im/ekg2/ekg2-0.3.1-r1.ebuild b/net-im/ekg2/ekg2-0.3.1-r2.ebuild index 6a40a0bba0c9..132f0af19f89 100644 --- a/net-im/ekg2/ekg2-0.3.1-r1.ebuild +++ b/net-im/ekg2/ekg2-0.3.1-r2.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-0.3.1-r1.ebuild,v 1.9 2015/05/08 04:26:44 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ekg2-0.3.1-r2.ebuild,v 1.1 2015/05/21 16:01:15 mgorny Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) @@ -14,34 +14,33 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="gadu gif gnutls gpg gpm gsm gtk idn jpeg ncurses nls - oracle perl python readline rss spell sqlite sqlite3 ssl threads unicode + oracle perl python readline rss spell sqlite ssl threads unicode xmpp xosd zlib" RDEPEND=" - gpg? ( app-crypt/gpgme ) - gsm? ( media-sound/gsm ) - gtk? ( x11-libs/gtk+:2 ) - idn? ( net-dns/libidn ) - nls? ( virtual/libintl ) - oracle? ( dev-db/oracle-instantclient-basic ) - perl? ( dev-lang/perl ) + gpg? ( app-crypt/gpgme:= ) + gsm? ( media-sound/gsm:= ) + gtk? ( x11-libs/gtk+:2= ) + idn? ( net-dns/libidn:= ) + nls? ( virtual/libintl:= ) + oracle? ( dev-db/oracle-instantclient-basic:= ) + perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline ) - ssl? ( dev-libs/openssl ) - xosd? ( x11-libs/xosd ) - zlib? ( sys-libs/zlib ) + readline? ( sys-libs/readline:0= ) + ssl? ( dev-libs/openssl:0= ) + xosd? ( x11-libs/xosd:= ) + zlib? ( sys-libs/zlib:= ) - gadu? ( <net-libs/libgadu-1.12 - gif? ( media-libs/giflib ) - jpeg? ( virtual/jpeg ) ) - ncurses? ( sys-libs/ncurses[unicode?] - gpm? ( sys-libs/gpm ) - spell? ( app-text/aspell ) ) - rss? ( dev-libs/expat ) - sqlite3? ( dev-db/sqlite:3 ) - !sqlite3? ( sqlite? ( dev-db/sqlite:0 ) ) - xmpp? ( dev-libs/expat - gnutls? ( net-libs/gnutls ) )" + gadu? ( <net-libs/libgadu-1.12:= + gif? ( media-libs/giflib:= ) + jpeg? ( virtual/jpeg:0= ) ) + ncurses? ( sys-libs/ncurses:=[unicode?] + gpm? ( sys-libs/gpm:= ) + spell? ( app-text/aspell:= ) ) + rss? ( dev-libs/expat:= ) + sqlite? ( dev-db/sqlite:3= ) + xmpp? ( dev-libs/expat:= + gnutls? ( net-libs/gnutls:= ) )" DEPEND="${RDEPEND} nls? ( sys-devel/gettext )" @@ -91,8 +90,7 @@ src_configure() { $(use_with python) $(use_with readline) $(use_with spell aspell) - $(use_with sqlite) - $(use_with sqlite3) + $(use_with sqlite sqlite3) $(use_with ssl openssl) $(use_with threads pthread) $(use_with xosd libxosd) @@ -101,6 +99,7 @@ src_configure() { $(use_enable unicode) --with-inotify --without-ioctld + --without-sqlite --disable-remote --enable-skip-relative-plugins-dir ) diff --git a/net-im/ekg2/metadata.xml b/net-im/ekg2/metadata.xml index 76636a13f8c2..9235b334061f 100644 --- a/net-im/ekg2/metadata.xml +++ b/net-im/ekg2/metadata.xml @@ -18,12 +18,6 @@ <flag name='ssl' restrict='=net-im/ekg2-0.3*'> Enable the complete SSL/TLS support through OpenSSL. This also enables the 'sim' plugin which relies on OpenSSL.</flag> - <flag name='sqlite3' restrict='<=net-im/ekg2-0.3.1-r1'> - Support logging messages into SQLite3 database. - If 'sqlite' is set too, SQLite3 will be used.</flag> - <flag name='sqlite' restrict='<=net-im/ekg2-0.3.1-r1'> - Support logging messages into SQLite2 database. - If 'sqlite3' is set too, it will be used instead.</flag> <flag name='oracle'>Support logging messages into Oracle database.</flag> <!-- common and modern flags --> @@ -34,5 +28,6 @@ <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='sqlite'>Support logging messages into SQLite3 database.</flag> </use> </pkgmetadata> |