Version bump, remove old, bug 399223.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 84 insertions, 58 deletions

diff --git a/net-libs/libgadu/ChangeLog b/net-libs/libgadu/ChangeLog
index 46ecd9cad63b..41095761cbcb 100644
--- a/net-libs/libgadu/ChangeLog
+++ b/net-libs/libgadu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libgadu
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libgadu/ChangeLog,v 1.64 2011/07/09 16:49:16 xarthisius Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libgadu/ChangeLog,v 1.65 2012/01/28 02:17:07 reavertm Exp $
+
+*libgadu-1.11.1 (28 Jan 2012)
+
+  28 Jan 2012; Maciej Mrozowski <reavertm@gentoo.org> +libgadu-1.11.1.ebuild,
+  -libgadu-1.9.1.ebuild:
+  Version bump, remove old, bug 399223.
 
   09 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> libgadu-1.11.0.ebuild:
   ppc stable wrt #372785
diff --git a/net-libs/libgadu/Manifest b/net-libs/libgadu/Manifest
index 500116d55005..41fd8ac3f5e8 100644
--- a/net-libs/libgadu/Manifest
+++ b/net-libs/libgadu/Manifest
@@ -2,17 +2,15 @@
 Hash: SHA1
 
 DIST libgadu-1.11.0.tar.gz 544803 RMD160 73e7e0a1dad14366938ef2f5b647cdc0c9b4a399 SHA1 05268aeea8ba972b9fd50aeaa4761eb73d522800 SHA256 68d4c7c7b0a2ea56b57a99804cb613e4a2834677fed3ddaaca639634da02aa10
-DIST libgadu-1.9.1.tar.gz 512563 RMD160 e17a7efd1b43a2e6d06a0521e8f27ccf4af5f072 SHA1 ec0a53bdbf6791baa5cd90d3d7ac4e0e7cf4df18 SHA256 669267f9b13879bab79923348158e8f545185b17690d5ecfb161125504a6e493
+DIST libgadu-1.11.1.tar.gz 548604 RMD160 bd801dd1026c7636ded6320091864420f7b7df31 SHA1 a26d6f45d54a6b426274a32b5d358d45d6806d7f SHA256 4293832ef0dd486e37fb3b0c8a19981df7a29d100afc363641b83b59940f594f
 EBUILD libgadu-1.11.0.ebuild 1441 RMD160 6470c39692ddbd27db03d0dc26c97f113c5370cf SHA1 dba165181efab848fe81a93e8749561e033d2d7d SHA256 9d3e21bb3bc7eff23559d5e1899e48159294cb6ce1343fe511e13c2e0fabdfab
-EBUILD libgadu-1.9.1.ebuild 1121 RMD160 76141424a3d6655534ff725faaea623e138c861e SHA1 ba0a2e92a98d34d4baad0a2ea44a1457d0f9124f SHA256 c8b15ff287e797d9483cbb08d2ae7a36b7580c5b2962fe8e2fbf1f2081860519
-MISC ChangeLog 8430 RMD160 e225bd599136cd0ba866ad4d8803b840119a9656 SHA1 8318a880118f15626f2e0c189ba0d01634871d25 SHA256 d6d7648a237927a6ad59ba7c63afc8450de7b83c81da0a5869521e9fc780f31e
+EBUILD libgadu-1.11.1.ebuild 1447 RMD160 adfc233ba042c5aff1f3b53e6f8134ece32dfb30 SHA1 d7f776e21d9eb3faa485f545da54eada3982e970 SHA256 a198386d8c0c70ee5bb6123089e67ccf6444b35b99cd6e35df87e9f04021071c
+MISC ChangeLog 8603 RMD160 2392a8e473fd1fdb8a14e1b4ed2126aed032b414 SHA1 9f2763900ae1f2d88cc5efb3ed46b5dc3c0bf925 SHA256 b85017659a89947f5a57196096c5b403f2c5ac031b01a5b2fa1bf8ed48d08965
 MISC metadata.xml 258 RMD160 fc4bdbc1fb86c35071fb934c536231e4d3e493bc SHA1 739942443b465ea4a29e1742b7ffdf9d8ec3574f SHA256 2f8c9c8d8671a47521046aeb7ba86a8e407ad25da4f2d31a87d34a6830cae052
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk4YhpMACgkQIiMqcbOVdxSfkAP+IyB4fe1tI/zX+SL+RD14KK0V
-xiKtocprqY9dGMI+aKvMQBVE+BmE0WVebutGtDRARg8VhfWw43JTGfj3wg+Kzw7J
-JIkaUs393ml+alvxEMxCh7nnAN7Puusd5+EyUWZRlK5lBLEH/BRCX+DrCliuhjkg
-T5XZn6ROL0wv4SnDYK8=
-=7Z8l
+iEYEARECAAYFAk8jWqcACgkQFuHa/bHpVdtlSgCdF4JSn05KWem6qU17LtqdctXR
+puMAnirenU4ujHyKY5GCZNQ5FaY0UIWM
+=f25d
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libgadu/libgadu-1.11.1.ebuild b/net-libs/libgadu/libgadu-1.11.1.ebuild
new file mode 100644
index 000000000000..7eea4d02a3b1
--- /dev/null
+++ b/net-libs/libgadu/libgadu-1.11.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libgadu/libgadu-1.11.1.ebuild,v 1.1 2012/01/28 02:17:07 reavertm Exp $
+
+EAPI="4"
+
+MY_P="${P/_/-}"
+
+inherit autotools-utils
+
+DESCRIPTION="This library implements the client side of the Gadu-Gadu protocol"
+HOMEPAGE="http://toxygen.net/libgadu/"
+SRC_URI="http://toxygen.net/libgadu/files/${MY_P}.tar.gz"
+
+# Bug 373215, relies on remote server presence
+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"
+
+REQUIRED_USE="
+	gnutls? ( ssl )
+"
+COMMON_DEPEND="
+	sys-libs/zlib
+	ssl? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? ( >=dev-libs/openssl-0.9.6m )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="${COMMON_DEPEND}
+	!=net-im/kadu-0.6.0.2
+	!=net-im/kadu-0.6.0.1
+"
+
+S="${WORKDIR}/${MY_P}"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+DOCS=(AUTHORS ChangeLog NEWS README)
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with threads pthread)
+	)
+
+	if use ssl; then
+		myeconfargs+=(
+			$(use_with gnutls gnutls)
+			$(use_with !gnutls openssl)
+		)
+	else
+		myeconfargs+=(
+			--without-gnutls
+			--without-openssl
+		)
+	fi
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	use doc && HTML_DOCS=(docs/html/)
+	autotools-utils_src_install
+}
diff --git a/net-libs/libgadu/libgadu-1.9.1.ebuild b/net-libs/libgadu/libgadu-1.9.1.ebuild
deleted file mode 100644
index f466a4122073..000000000000
--- a/net-libs/libgadu/libgadu-1.9.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libgadu/libgadu-1.9.1.ebuild,v 1.8 2011/03/25 10:17:47 xarthisius Exp $
-
-EAPI="3"
-
-MY_P="${P/_/-}"
-
-inherit autotools-utils
-
-DESCRIPTION="This library implements the client side of the Gadu-Gadu protocol"
-HOMEPAGE="http://toxygen.net/libgadu/"
-SRC_URI="http://toxygen.net/libgadu/files/${MY_P}.tar.gz"
-
-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 ssl static-libs threads"
-
-COMMON_DEPEND="
-	ssl? ( >=dev-libs/openssl-0.9.6m )
-"
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="${COMMON_DEPEND}
-	!=net-im/kadu-0.6.0.2
-	!=net-im/kadu-0.6.0.1
-"
-
-S="${WORKDIR}/${MY_P}"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-DOCS=(AUTHORS ChangeLog NEWS README)
-
-src_configure() {
-	myeconfargs=(
-		$(use_with ssl openssl)
-		$(use_with threads pthread)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	use doc && HTML_DOCS=(docs/html/)
-	autotools-utils_src_install
-}