Version bump, remove old.

Package-Manager: portage-2.2.12/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xB1E955DB

5 files changed, 53 insertions, 14 deletions

diff --git a/net-libs/libgadu/ChangeLog b/net-libs/libgadu/ChangeLog
index ad6653bba378..ed83f1e4b3de 100644
--- a/net-libs/libgadu/ChangeLog
+++ b/net-libs/libgadu/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/libgadu
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libgadu/ChangeLog,v 1.75 2014/05/26 05:51:33 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libgadu/ChangeLog,v 1.76 2014/08/13 02:30:01 reavertm Exp $
+
+*libgadu-1.12.0 (13 Aug 2014)
+
+  13 Aug 2014; Maciej Mrozowski <reavertm@gentoo.org>
+  +files/libgadu-1.12.0-tests.patch, +libgadu-1.12.0.ebuild,
+  -libgadu-1.11.3.ebuild, metadata.xml:
+  Version bump, remove old.
 
   26 May 2014; Manuel Rüger <mrueg@gentoo.org> libgadu-1.11.3.ebuild,
   libgadu-1.11.4.ebuild:
diff --git a/net-libs/libgadu/Manifest b/net-libs/libgadu/Manifest
index 1ac9ddffb546..8752fa1f73ee 100644
--- a/net-libs/libgadu/Manifest
+++ b/net-libs/libgadu/Manifest
@@ -1,10 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX libgadu-1.12.0-tests.patch 453 SHA256 b4e844c701ab956d4b8fa6ed16b03235510f51c5c634238c8fd43d2da0cbc82f SHA512 e024677ac361675e02518c692c9ecf2b1ea2a74fba3ed55506c67f70c911821421128214691487b09a8c315776f11afe5390135afcc7c33e04175f419ee69b39 WHIRLPOOL 1f4f27caa8943500dad229329cb311b5062e8bd10299ca289a7a80b21471e6f8d79039b9807be6e85a51a7602ea6c1e947b925dc0556dc1cdfb11d1599f25b4c
 DIST libgadu-1.11.0.tar.gz 544803 SHA256 68d4c7c7b0a2ea56b57a99804cb613e4a2834677fed3ddaaca639634da02aa10
 DIST libgadu-1.11.1.tar.gz 548604 SHA256 4293832ef0dd486e37fb3b0c8a19981df7a29d100afc363641b83b59940f594f SHA512 3b2e6f6438068ab734b77ef9c1a57823830fa3e891aa7e324061d08e6f108e2ef3901b5a9444fb56670d65dcfd4c9a2f1324f140b2e560b06bef2cfc3f3fa623 WHIRLPOOL 4e93fa56c25280f972b9079c6185a8942b7425a6d65564f4c3e5dcf9765e22e52561b1f4355ec340d0bc82e12eddc6f19529404c8ecd828385d04f4c287b5f2e
-DIST libgadu-1.11.3.tar.gz 210852 SHA256 81a45f98e07627d092bb2bf6d78413fa4a19407900337ffdedc81bd904d1d0af SHA512 19c2f999666cc3ccd24f74d6d92a8df5206be217348036113bdf1f15fca1de607c0bf61031062c0ab7f07940c4371276b7b316a0f85ba013876254e8d1d97965 WHIRLPOOL 81fb4a1474942a5dcd39dfa7651d6f1c1488d5ee465db9060af4304183dcc7fe332b342cb850e57e8a01309c02d853a63d6c1c445285486c675df31b50e38e5e
 DIST libgadu-1.11.4.tar.gz 210937 SHA256 95d445a6fefa7b9c7af2f552f090cf6760e3fc7b5c563ec563f11a9fe1f408d5 SHA512 3fc8e414470864eb953d6d0d7dc6071679907c435d76e05a0b95a2e58365fc795427679f893d337dbf9896611a6bf68047c36806b977643cf4a773d930916639 WHIRLPOOL 4f13869f871e1a57f9aeccb9530c222960bee515065090a72a141d4a3212493df9007af7494598a26ee86a7e0cde18c8fd1b253024944b71538ca93bc94640f0
+DIST libgadu-1.12.0.tar.gz 290361 SHA256 536862af3beeeb9a3d17bc73c880204200a8aa1e1cbbf97e01486e024b955037 SHA512 62d1db0e0a59ce7e9a27a2002eea26e69b476a5bddeec129ec6e37d6141dc74e51b177a2cacd232031253d19d223f20ae68df1981f1f673485447950a0bc6670 WHIRLPOOL 1d4cf9634dc652368ce79f276f61a48faae7759d874f906c10e0fce24b0ff76542bfa0df632eb715536c5e775352c180422cca94dfcfae9ebb5b85cbc87409c5
 EBUILD libgadu-1.11.0.ebuild 1405 SHA256 ab7ac40cb6b8ec370a325e223ff16a3ecf40a64406f2e5309097a398db4a3721 SHA512 7fbb2bb268827c00fd12d57ca9576101b44e65563981698a6ccba584d3a749c8a4a15607e6a8d3726eea29eb7c183f4f3d46258b47f58145635da6619196884e WHIRLPOOL b40101dd88fa6c29c0c1a85fd510123d574b9109d15d0d8f35451df5d5e96a5659fd363898877de804c321d007566905b0e18a70dfd66d46a92d177cf68c1d0c
 EBUILD libgadu-1.11.1.ebuild 1429 SHA256 0c60d4e64a9b077c5e1394d1ef4216cc690c1752e602eb2b58e3043d42a43430 SHA512 71baa657e389f5a63a9705b11cec549f100ab19209df8530b1b8f707c803b9c92cdc7ddf92aefd3bec9e6b9fafc79aeee1361a7bbba80384d6d6bed4b3095899 WHIRLPOOL 7198ff86a6f5de6d54dc30692ad6996f5e07631585d136e4e08d018d8f916e4a6439ff36de956854bb86fd49982fd3d0b8ee84ccc92e019d66b68634ea3b860e
-EBUILD libgadu-1.11.3.ebuild 1446 SHA256 15b7503b70dee1a05c6f3733b1d6cbfabfdb063750a78c2110e2e3b6fb3d933e SHA512 30b3f32492620a129c43307e43d19c7fba8b931fceb9ee308c126bbceb41791abbb64e59439bb32695a5afa5ef8830d983e452a5d8b37b53c8db77a43d825852 WHIRLPOOL a800f3eb4c558d20b7ed506984989ace9dfb684b96a3ea77ab7fde7eacbcaddd68d96565df4c861a5ad7d6805fcdc95655f4acc7cfb3bdc7142e8b7340d5e64e
 EBUILD libgadu-1.11.4.ebuild 1446 SHA256 dbe79abd70bd9bc4391ba52b59a35a4e95f1b1778627716c1a10e368f213b0f1 SHA512 6ace9c5a88145b19e43943da532f88fbb1adc65a834b2f1d2fc4a7ec7adbb2793241c458c0eec79898e13de324fa5d57930ee1cde536e04a726bdfd3180e7334 WHIRLPOOL 87e54ebf516a9d423b8407e1080232be0db93128b2ce61d5c288400bae9041f5de27f004aa48057ff2ad529742b1c4f7504dd7157e21989ea6582a0f1ba21c78
-MISC ChangeLog 9858 SHA256 9f0e2f3a4d3d5d3e677383eff4419ea4e39dbb1e188af7823de3cb04e13db85d SHA512 dc3482232e082c382d0c0765011d99bcf969686df0f47135ebb636fd492200ef8f7371657bf5ed5b821e9e0313b488347ec76e68481b1be1afd224a0033e9ac1 WHIRLPOOL 485774747838af9cf4faf7488c134c693753eef8cda89996c07671210f6f72cc1514a0b4ca6b3e8a9b22b0ac183052a40207d6694ae756731d9c04c8a5f3683b
-MISC metadata.xml 258 SHA256 2f8c9c8d8671a47521046aeb7ba86a8e407ad25da4f2d31a87d34a6830cae052 SHA512 0e56317d1cf995236f3cf92b9c01de4cccaf0ab1779bc2e1742f3bb36c8256a7bde702ca3738ca1d824d34c15d038d66f6b23b33be5561afd6879fed6056af0e WHIRLPOOL c77d0300654da67186ce2c72dbf3f46e050267fdaaa6875fff363c4de1586a426102bcaf11775a9bf97a1eee88671f2fd53379b96a9e65dce90de2dd7df1557f
+EBUILD libgadu-1.12.0.ebuild 1600 SHA256 4fc70d94864423af1dc9018d2b6983a1c367a98370eec3d692bc8c2ace498f27 SHA512 eb64174c2b584be087a51e35e106891b3f2c6faf77e9ea092af6fd63afff9d2bf7e49c105ad4d8420d460ef06b32acd2a59d4050673eb833c7887075cc1ba7b3 WHIRLPOOL 5b0c94eae723258bc331605357d11c5ecd2b3879db679f88162dcfd9a87dc8f91635dce4e02f26d3eb400336897ffc77df110b4235ccf443206568d09420b4aa
+MISC ChangeLog 10076 SHA256 2b88970b042663e5e073c9f261226c38a68b0b8648eaf1fddcfef3640244b70c SHA512 f8c35e494874ef02e8c51819f51e649792fafec0d3ec20286fe00345e4a75f9f4e4377df6431cd155251104de0171fb890ce3761f02046f0c3bd9403e0669848 WHIRLPOOL 1ec28375f8112590616d361a900e40cd9eb2da3c9338b6be7d1ce8a5785aa6213354ba567480ccc6758b88b385cb09b2e1e883d390659acd071dd4187748b085
+MISC metadata.xml 336 SHA256 1a16ea2109a3b860f0654e4c1f6528edadd46f5eb0a64fe38f5066fb9440ea85 SHA512 eb8f01c6daa8b6e053b518bbab180c237af1a97ee37794eaf2313049684402e7125fa5680d01689613eb637fc66a0f2493edcea646f49fb6d696f8f22ff8fd48 WHIRLPOOL 7b6768a6cb811d8ab91df7508dec4cbde29bbbb612fe29c762fa16a54a9771b5af43ff7163ed38c4864225af9a18e99079d5daf2a44ce0532d798f586faface9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlPqzcQACgkQFuHa/bHpVdstHwCfZCdLjnf8dWh2QE3TTMWb2Tur
+DKwAnAl/vlYyuF7EdeKHFElaxwh1TrvJ
+=a4bG
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libgadu/files/libgadu-1.12.0-tests.patch b/net-libs/libgadu/files/libgadu-1.12.0-tests.patch
new file mode 100644
index 000000000000..56e1da45b096
--- /dev/null
+++ b/net-libs/libgadu/files/libgadu-1.12.0-tests.patch
@@ -0,0 +1,12 @@
+diff -ruN libgadu-1.12.0/test/manual/lib/base64.c my/test/manual/lib/base64.c
+--- libgadu-1.12.0/test/manual/lib/base64.c	2014-06-13 20:41:37.000000000 +0200
++++ my/test/manual/lib/base64.c	2014-08-13 03:08:00.612006311 +0200
+@@ -30,7 +30,7 @@
+ #include <openssl/bio.h>
+ #include <openssl/buffer.h>
+ 
+-char *gg_base64_encode(const char *input, ssize_t len)
++char *gg_base64_encode2(const char *input, ssize_t len)
+ {
+ 	BIO *bmem, *b64;
+ 	BUF_MEM *bptr;
diff --git a/net-libs/libgadu/libgadu-1.11.3.ebuild b/net-libs/libgadu/libgadu-1.12.0.ebuild
index 8c8fe0f6ac0f..5c32e81e93fa 100644
--- a/net-libs/libgadu/libgadu-1.11.3.ebuild
+++ b/net-libs/libgadu/libgadu-1.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libgadu/libgadu-1.11.3.ebuild,v 1.2 2014/05/26 05:51:33 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libgadu/libgadu-1.12.0.ebuild,v 1.1 2014/08/13 02:30:01 reavertm Exp $
 
 EAPI=5
 
@@ -10,19 +10,17 @@ DESCRIPTION="This library implements the client side of the Gadu-Gadu protocol"
 HOMEPAGE="http://toxygen.net/libgadu/"
 SRC_URI="https://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-# Bug 373215, last checked 2012.01.28
-RESTRICT="test"
-
 LICENSE="LGPL-2.1"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
 SLOT="0"
-IUSE="doc gnutls ssl static-libs threads"
+IUSE="doc +gg11 gnutls ssl static-libs test threads"
 
 REQUIRED_USE="
 	gnutls? ( ssl )
 "
 COMMON_DEPEND="
 	sys-libs/zlib
+	gg11? ( >=dev-libs/protobuf-c-0.15 )
 	ssl? (
 		gnutls? ( net-libs/gnutls )
 		!gnutls? ( >=dev-libs/openssl-0.9.6m )
@@ -30,22 +28,30 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	doc? ( app-doc/doxygen )
+	test? (
+		dev-libs/expat
+		dev-libs/libxml2:2
+		net-misc/curl
+	)
 "
 RDEPEND="${COMMON_DEPEND}
 	!=net-im/kadu-0.6.0.2
 	!=net-im/kadu-0.6.0.1
 "
 
+AUTOTOOLS_AUTORECONF=1
 AUTOTOOLS_IN_SOURCE_BUILD=1
 
-DOCS=(AUTHORS ChangeLog NEWS README)
+PATCHES=(
+	"${FILESDIR}/${P}-tests.patch"
+)
 
-src_prepare() {
-	eautoreconf
-}
+DOCS=(AUTHORS ChangeLog NEWS README)
 
 src_configure() {
 	local myeconfargs=(
+		$(use_with gg11 protobuf)
+		$(use_enable test tests)
 		$(use_with threads pthread)
 	)
 
diff --git a/net-libs/libgadu/metadata.xml b/net-libs/libgadu/metadata.xml
index 162be091205d..1cacbbfed2b5 100644
--- a/net-libs/libgadu/metadata.xml
+++ b/net-libs/libgadu/metadata.xml
@@ -6,4 +6,7 @@
 		<email>reavertm@gentoo.org</email>
 		<name>Maciej Mrozowski</name>
 	</maintainer>
+	<use>
+		<flag name="gg11">Enable GaduGadu 11 protocol support</flag>
+	</use>
 </pkgmetadata>