Version bump, remove old.

(Portage version: 2.2.12/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key B1E955DB)

4 files changed, 38 insertions, 10 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/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>