Version bump to 3.2.5.

Fix bug 281170.
Package-Manager: portage-14113-svn/cvs/Linux i686

4 files changed, 24 insertions, 75 deletions

diff --git a/net-voip/ekiga/ChangeLog b/net-voip/ekiga/ChangeLog
index c0f7eb72ca29..8503245920a4 100644
--- a/net-voip/ekiga/ChangeLog
+++ b/net-voip/ekiga/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-voip/ekiga
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ChangeLog,v 1.6 2009/08/03 21:34:42 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ChangeLog,v 1.7 2009/08/26 11:25:39 volkmar Exp $
+
+*ekiga-3.2.5 (26 Aug 2009)
+
+  26 Aug 2009; Mounir Lamouri <volkmar@gentoo.org>
+  -files/ekiga-3.2.4-gtk+-2.12-fix.patch, -ekiga-3.2.4.ebuild,
+  +ekiga-3.2.5.ebuild:
+  Version bump to 3.2.5. Fix bug 281170.
 
   03 Aug 2009; Markus Meier <maekke@gentoo.org> ekiga-3.2.4.ebuild:
   add ~amd64, bug #276355
diff --git a/net-voip/ekiga/Manifest b/net-voip/ekiga/Manifest
index 17337b6ef4b2..b95939dd1af8 100644
--- a/net-voip/ekiga/Manifest
+++ b/net-voip/ekiga/Manifest
@@ -1,23 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ekiga-1.99.0-configure.patch 669 RMD160 fa6cfdb6f1613e63b3af9a60d4f14b0260bae2db SHA1 c7f05a63821c2f890f6bc4dc9b3a848500833e7d SHA256 5c8ffcb27ebf51a0f39ae866e8b9637f56bad8fe113adb6122da4d973d55dd80
 AUX ekiga-2.0.12-gdu.patch 2274 RMD160 b7f44eee0568e3baa844a2e08994718711bfe773 SHA1 6b5c6fdd950ff196f7f87546f403144f09a60b0a SHA256 c0877de2bb725f26d162d5f48d14302753ddf6e7b5ad318d5aa39759abc8e32c
-AUX ekiga-3.2.4-gtk+-2.12-fix.patch 652 RMD160 9105af5bac8217f21b6bfefa4992ac229cb677d9 SHA1 c7ef57f5c4569c826b187c9d58767205fe22a746 SHA256 1accddbb079d4de10af8782fa0ffe38828ecbf5918d5539a9500421677e014cd
 AUX ekiga-eggtrayicon-transparency.diff 2960 RMD160 9303bf9c0dcb2f666b88622a772540136f0a63df SHA1 d8a7b866ba119d286899f19a3ddb618f117398de SHA256 9cf235b64f1201e0119a55c76db6d1c243abb971757e5d781aa95c3724138e37
 AUX ekiga-eggtrayicon-update.diff 13969 RMD160 159f1164516362b90ef8e63988ba5fa77c544e13 SHA1 edc6809219a312483f2f8c77f07a0d88a2ce5cff SHA256 1db286369b81677d559b38261ce5f6686de41e3d645808f7ecb57cee6eaf82d6
 AUX not-gnome.patch 413 RMD160 571716d78f27b192ed36e5259d676ed4320bf1bd SHA1 1f19b5d7add4db5fa1f4e301d92101188c48006f SHA256 6287ffec378a85425ecd0b4f6ea9b445c3151c7259d130630de63f88dbd69c8d
 DIST ekiga-2.0.12.tar.bz2 6109264 RMD160 04ee5c8a878650b545e9e2a547a08dde4e7be3c8 SHA1 e80a2dae4541708768ac8c38ebb1452a2d0911d4 SHA256 5747802480b44a3cde8fd52f381b1761db52354d74fce7df380a2fbaa71910e9
-DIST ekiga-3.2.4-remove-exceptions.patch.bz2 10607 RMD160 77160e811fc657054f1edd58b3844eb2e8fc7e81 SHA1 2287e8b6405f5621267801c6ebcf38e4f5740558 SHA256 e5a59b796165aeb337d63047d8868da3725f5054f594362be7a75075a05a50cc
-DIST ekiga-3.2.4.tar.bz2 7747447 RMD160 3012532f19f2220a8817f1b748e6ddb66c4ef9fc SHA1 7394fbf5d437a76fd7cfd8519ee7dbfb0604f0c6 SHA256 21032e8a420365d0539c6356d220bb8634e9c1ee839bfcceb3c03d9e427cd397
+DIST ekiga-3.2.5.tar.bz2 7714135 RMD160 5792890c13d376242defd0757a67c8aa7772ae23 SHA1 fc8b9ed0492ebc083655cf706048032e552d347f SHA256 6a624b741b110b5b1d9cdff8179760f52b0a623bf597b8e6be757fc18af20a4c
 EBUILD ekiga-2.0.12.ebuild 2373 RMD160 99cd6a5f486123ee6670034cff4abac1834889b3 SHA1 033920369d95b35f6a8d00663e8c2b9ee13dc729 SHA256 ef951f5be624e6f75621400c2921f9cc5cfdb3d76fd8abcb7ffe833840bdb38a
-EBUILD ekiga-3.2.4.ebuild 6634 RMD160 3859afc5bea21de72f581b9b7b04e146e8980efe SHA1 75f09d3dbd3d481579bfe56a36d3a97fe28b614b SHA256 d28596f87bcad38d3a0ee76694708f2977f97527e90fd07c2f96887b177d1e56
-MISC ChangeLog 9143 RMD160 c5233887c801597943f08deb33953699d71e4e62 SHA1 e5bf27825b6020b55407e858e6cd9eac3e85b430 SHA256 02924483935d3e08d89c3551358fe7346da4754669f522a95572c58765cae45d
+EBUILD ekiga-3.2.5.ebuild 5819 RMD160 6e7924f7acb8e9c4b0253e1caf7cdc4ae084c034 SHA1 6f3507da1077b9ea4a8fdd590981bff1c44719d3 SHA256 e93150f6b2aad641ec01ce97961281050bf7bae1de8f275d276629c124144b5b
+MISC ChangeLog 9351 RMD160 0252217ab740a7b5b89d28fb820ec342b671f3b7 SHA1 11901a72fd00d43c3c35f13c70446485da1c88a0 SHA256 cfa198272b89da68f9418c321bff2f4cc0b07239c91d89418f59cb41e9f018d6
 MISC metadata.xml 633 RMD160 b150c117256e7db16516e82f6b1af0251b9c249c SHA1 e0449bb6c85b7fee51ee4d1c97e6270befeb858f SHA256 80120551137ed52fd1085a838ed54772af862e793116f2d3e1bd2cdf538e8ccf
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkp3WCUACgkQkKaRLQcq0GJpDQCeKDBmFI/YV5a19WEaw3tHxny+
-XUQAniaHJZBuke4Oo5/t8NnHOOB+BerA
-=4FGZ
------END PGP SIGNATURE-----
diff --git a/net-voip/ekiga/ekiga-3.2.4.ebuild b/net-voip/ekiga/ekiga-3.2.5.ebuild
index 27fb2df66438..35df748b6353 100644
--- a/net-voip/ekiga/ekiga-3.2.4.ebuild
+++ b/net-voip/ekiga/ekiga-3.2.5.ebuild
@@ -1,17 +1,18 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ekiga-3.2.4.ebuild,v 1.4 2009/08/03 21:34:42 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ekiga-3.2.5.ebuild,v 1.1 2009/08/26 11:25:39 volkmar Exp $
 
 EAPI="2"
 
 KDE_REQUIRED="optional"
+WANT_CMAKE="false"
+GCONF_DEBUG="no" # debug managed by the ebuild
 
-inherit eutils kde4-base gnome2
+inherit kde4-base gnome2
 # gnome2 at the end to make it default
 
 DESCRIPTION="H.323 and SIP VoIP softphone"
 HOMEPAGE="http://www.ekiga.org/"
-SRC_URI="${SRC_URI} mirror://gentoo/${P}-remove-exceptions.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -22,8 +23,8 @@ libnotify mmx nls +shm +sip static v4l xcap xv"
 RDEPEND=">=dev-libs/glib-2.8.0:2
 	dev-libs/libsigc++:2
 	dev-libs/libxml2:2
-	>=net-libs/opal-3.6.2[audio,sip,video,debug=,h323?]
-	>=net-libs/ptlib-2.6.2[stun,video,wav,debug=]
+	>=net-libs/opal-3.6.4[audio,sip,video,debug=,h323?]
+	>=net-libs/ptlib-2.6.4[stun,video,wav,debug=]
 	>=x11-libs/gtk+-2.12.0:2
 	avahi? ( >=net-dns/avahi-0.6[dbus] )
 	dbus? ( >=sys-apps/dbus-0.36
@@ -52,21 +53,8 @@ DEPEND="${RDEPEND}
 		app-text/gnome-doc-utils )
 	v4l? ( sys-kernel/linux-headers )"
 
-DOC_LINGUAS="bg ca de el en_GB es eu fi fr oc pt_BR ru sv uk"
-IUSE_LINGUAS="${DOC_LINGUAS} am ar as az be bg bn_IN bn bs ca crh cs cy da de dz
-el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kn ko ku
-lt lv mai mk ml mn mr ms nb ne nl nn oc or pa pl pt_BR pt ro ru rw si sk sl sq
-sr@latin sr sv ta te th tr uk vi wa xh zh_CN zh_HK zh_TW"
-
-for l in ${IUSE_LINGUAS}; do
-	IUSE="${IUSE} linguas_${l}"
-done
-
 DOCS="AUTHORS ChangeLog FAQ MAINTAINERS NEWS README TODO"
 
-# debug is managed by the ebuild
-GCONF_DEBUG="no"
-
 # NOTES:
 # having >=gtk+-2.14 is actually removing need of +gnome but it's clearer to
 # 	represent it with || in gnome dep
@@ -75,7 +63,7 @@ GCONF_DEBUG="no"
 # ptlib/opal needed features are not checked by ekiga, upstream bug 577249
 # opal[sip] should be opal[sip?], upstream bug 577248
 # libnotify-0.4.4 bug with +debug, upstream bug 583719
-# doc is not installing dev doc (doxygen)
+# +doc is not installing dev doc (doxygen)
 
 # TODO:
 # if really want to use ked4-base, should use COMMONDEPEND
@@ -101,13 +89,6 @@ pkg_setup() {
 		die "You need to enable kde or disable kontact."
 	fi
 
-	strip-linguas ${IUSE_LINGUAS}
-
-	if [[ -z "${LINGUAS}" ]]; then
-		# no linguas set, using the default one
-		LINGUAS=" "
-	fi
-
 	# update scrollkeeper database if doc has been enabled
 	if use doc; then
 		SCROLLKEEPER_UPDATE=1
@@ -149,32 +130,26 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
-	epatch "${FILESDIR}"/${P}-gtk+-2.12-fix.patch
-	epatch "${WORKDIR}"/${P}-remove-exceptions.patch
-
 	# remove call to gconftool-2 --shutdown, upstream bug 555976
 	# gnome-2 eclass is reloading schemas with SIGHUP
-	sed -i -e '/gconftool-2 --shutdown/d' Makefile.in \
-		|| die "patching Makefile.in failed"
+	sed -i -e '/gconftool-2 --shutdown/d' Makefile.in || die "sed failed"
 
 	# SIP is automatically enabled with opal[sip], want it to be a user choice
 	# upstream bug 575832
 	if ! use sip; then
-		sed -i -e "s/SIP=\"yes\"/SIP=\"no\"/" configure \
-			|| die "patching configure failed"
+		sed -i -e "s/SIP=\"yes\"/SIP=\"no\"/" configure || die "sed failed"
 		sed -i -e \
 			"s:SIP=\`\$PKG_CONFIG --variable=OPAL_SIP opal\`:SIP=\"no\":" \
-			configure || die "patching configure failed"
+			configure || die "sed failed"
 	fi
 
 	# H323 is automatically enabled with opal[h323], want it to be a user choice
 	# upstream bug 575833
 	if ! use h323; then
-		sed -i -e "s/H323=\"yes\"/H323=\"no\"/" configure \
-			|| die "patching configure failed"
+		sed -i -e "s/H323=\"yes\"/H323=\"no\"/" configure || die "sed failed"
 		sed -i -e \
 			"s:H323=\`\$PKG_CONFIG --variable=OPAL_H323 opal\`:H323=\"no\":" \
-			configure || die "patching configure failed"
+			configure || die "sed failed"
 	fi
 
 	# V4L support is auto-enabled, want it to be a user choice
@@ -182,7 +157,7 @@ src_prepare() {
 	# TODO: check if upstream has removed this hack
 	if ! use v4l; then
 		sed -i -e "s/V4L=\"enabled\"/V4L=\"disabled\"/" configure \
-			|| die "patching configure failed"
+			|| die "sed failed"
 	fi
 }
 
diff --git a/net-voip/ekiga/files/ekiga-3.2.4-gtk+-2.12-fix.patch b/net-voip/ekiga/files/ekiga-3.2.4-gtk+-2.12-fix.patch
deleted file mode 100644
index 9378590a0252..000000000000
--- a/net-voip/ekiga/files/ekiga-3.2.4-gtk+-2.12-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 6e79ecaaa2230a879ea51ff7c5680d9402b96321 Mon Sep 17 00:00:00 2001
-From: Eugen Dedu <Eugen.Dedu@pu-pm.univ-fcomte.fr>
-Date: Mon, 25 May 2009 12:14:23 +0000
-Subject: Fix compilation with gtk 2.12
-
----
-diff --git a/src/gui/assistant.cpp b/src/gui/assistant.cpp
-index 238609b..883c10d 100644
---- a/src/gui/assistant.cpp
-+++ b/src/gui/assistant.cpp
-@@ -343,7 +343,7 @@ static void
- name_changed_cb (GtkEntry     *entry,
-                  GtkAssistant *assistant)
- {
--  set_current_page_complete (assistant, gtk_entry_get_text_length (entry) > 0);
-+  set_current_page_complete (assistant, (gtk_entry_get_text (entry))[0] != '\0');
- }
- 
- 
---
-cgit v0.8.2