Didn't meant to remove ekiga-3.2.7...

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 16 insertions, 22 deletions

diff --git a/net-voip/ekiga/ChangeLog b/net-voip/ekiga/ChangeLog
index aeaf29c32673..75ee3ecba546 100644
--- a/net-voip/ekiga/ChangeLog
+++ b/net-voip/ekiga/ChangeLog
@@ -1,12 +1,16 @@
 # ChangeLog for net-voip/ekiga
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ChangeLog,v 1.20 2010/10/27 22:53:53 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ChangeLog,v 1.21 2010/10/28 08:21:35 volkmar Exp $
 
-  27 Oct 2010; <volkmar@gentoo.org> -ekiga-3.2.6.ebuild,
+  28 Oct 2010; Mounir Lamouri <volkmar@gentoo.org> -ekiga-3.2.5-r2.ebuild,
+  +ekiga-3.2.7.ebuild:
+  Didn't meant to remove ekiga-3.2.7...
+
+  27 Oct 2010; Mounir Lamouri <volkmar@gentoo.org> -ekiga-3.2.6.ebuild,
   -ekiga-3.2.7.ebuild:
   Removing old ebuilds.
 
-  27 Oct 2010; <volkmar@gentoo.org> ekiga-3.2.7.ebuild:
+  27 Oct 2010; Mounir Lamouri <volkmar@gentoo.org> ekiga-3.2.7.ebuild:
   Update required glib version.
 
 *ekiga-3.2.7 (19 Aug 2010)
diff --git a/net-voip/ekiga/Manifest b/net-voip/ekiga/Manifest
index 30d95dca21b5..62b137d778aa 100644
--- a/net-voip/ekiga/Manifest
+++ b/net-voip/ekiga/Manifest
@@ -4,8 +4,8 @@ AUX ekiga-eggtrayicon-transparency.diff 2960 RMD160 9303bf9c0dcb2f666b88622a7725
 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.5.tar.bz2 7714135 RMD160 5792890c13d376242defd0757a67c8aa7772ae23 SHA1 fc8b9ed0492ebc083655cf706048032e552d347f SHA256 6a624b741b110b5b1d9cdff8179760f52b0a623bf597b8e6be757fc18af20a4c
+DIST ekiga-3.2.7.tar.bz2 9093433 RMD160 0e87b60f144df65f3070c21fe7b8126e42941196 SHA1 c2ed571a5f5f058b6d80c091dd69dfe557c17df2 SHA256 f25a1309b68eafe69f0d7aed461bc9a8196939060543d09bd2f19e0bb1e3fd8f
 EBUILD ekiga-2.0.12.ebuild 2364 RMD160 5fbb45773a8a43cdbbd39cc1d3dd9ea4b6f8def1 SHA1 0d9b91cde40c812fe9ea93cd9e074ffc184c4071 SHA256 3656897a6d7059d9c0c7c2ec3675e8e979b580cb3e94f13f17678d146942aa9a
-EBUILD ekiga-3.2.5-r2.ebuild 5397 RMD160 7afc7b3d6d9b84e7261789d2e48c68ff301053fe SHA1 f46566d4c33af10694b90152fbcb32df59b5a6a0 SHA256 6c805cf2ad01210bb0915e4670b8f81dcef1f9a8cb5e1f73e52772c53e132b4b
-MISC ChangeLog 11171 RMD160 6fc0ec26eadc70fc5c7df13ffeb39c3c6574806a SHA1 c50be39abb3fe37ed92f589f778b27b11ab4b8d1 SHA256 c05039b50480fde2dd222eadcee175996ed927e18426c564f6ec3eae15c0f579
+EBUILD ekiga-3.2.7.ebuild 5004 RMD160 b5d029a36acdf0ac67187787c7a629ddf9f2425c SHA1 dee89d137514c8805f18809a3a7c30bc015ac1d6 SHA256 cb1d0efe9d2aa0da42683eabe43a83304de51cfa8dcb7e36becb23f8feaf1e0a
+MISC ChangeLog 11340 RMD160 fabc5714adb0ac21b41689420a983a538c2bee83 SHA1 ade8b53ca391926392fc052f64f17e849aaba173 SHA256 943d89f773afc29ecd76a381355f68e3c3efd919bc04e999a63f1906c1973925
 MISC metadata.xml 572 RMD160 ed1c0b6f7b51be67aa96c2c5c042fbef023c6a72 SHA1 33e80a99b5ad43d02439c5454f594adb961307d8 SHA256 6c1b059a423b06dae8acda431a06e0a80568b3fce52d6c9d42cceddc2325a8b2
diff --git a/net-voip/ekiga/ekiga-3.2.5-r2.ebuild b/net-voip/ekiga/ekiga-3.2.7.ebuild
index cbef9cfe7ef8..496d737e2caf 100644
--- a/net-voip/ekiga/ekiga-3.2.5-r2.ebuild
+++ b/net-voip/ekiga/ekiga-3.2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ekiga-3.2.5-r2.ebuild,v 1.6 2010/05/01 00:54:12 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ekiga-3.2.7.ebuild,v 1.4 2010/10/28 08:21:35 volkmar Exp $
 
 EAPI="2"
 
@@ -20,11 +20,11 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE="avahi dbus debug doc eds gconf gnome gstreamer h323 kde kontact ldap
 libnotify mmx nls +shm static v4l xcap xv"
 
-RDEPEND=">=dev-libs/glib-2.8.0:2
+RDEPEND=">=dev-libs/glib-2.14.0:2
 	dev-libs/libsigc++:2
 	dev-libs/libxml2:2
-	>=net-libs/opal-3.6.4[audio,sip,video,debug=,h323?]
-	>=net-libs/ptlib-2.6.4[stun,video,wav,debug=]
+	>=net-libs/opal-3.6.8[audio,sip,video,debug=,h323?]
+	>=net-libs/ptlib-2.6.7[stun,video,wav,debug=]
 	>=x11-libs/gtk+-2.12.0:2
 	avahi? ( >=net-dns/avahi-0.6[dbus] )
 	dbus? ( >=sys-apps/dbus-0.36
@@ -38,8 +38,7 @@ RDEPEND=">=dev-libs/glib-2.8.0:2
 	kde? ( kontact? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} ) )
 	ldap? ( dev-libs/cyrus-sasl:2
 		net-nds/openldap )
-	libnotify? ( x11-libs/libnotify
-		debug? ( >=x11-libs/libnotify-0.4.5 ) )
+	libnotify? ( x11-libs/libnotify )
 	shm? ( x11-libs/libXext )
 	xcap? ( net-libs/libsoup:2.4 )
 	xv? ( x11-libs/libXv )"
@@ -59,7 +58,6 @@ DOCS="AUTHORS ChangeLog FAQ MAINTAINERS NEWS README TODO"
 # TODO: gnome2 eclass add --[dis|en]able-gtk-doc wich throws a QA warning
 #	a patch has been submitted, see bug 262491
 # ptlib/opal needed features are not checked by ekiga, upstream bug 577249
-# libnotify-0.4.4 bug with +debug, upstream bug 583719
 # +doc is not installing dev doc (doxygen)
 
 # UPSTREAM:
@@ -104,6 +102,7 @@ pkg_setup() {
 		$(use_enable gconf schemas-install)
 		$(use_enable gnome)
 		$(use_enable gstreamer)
+		$(use_enable h323)
 		$(use_enable kde)
 		$(use_enable kontact kab)
 		$(use_enable ldap)
@@ -124,15 +123,6 @@ src_prepare() {
 	# gnome-2 eclass is reloading schemas with SIGHUP
 	sed -i -e '/gconftool-2 --shutdown/d' Makefile.in || die "sed failed"
 
-	# 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 "sed failed"
-		sed -i -e \
-			"s:H323=\`\$PKG_CONFIG --variable=OPAL_H323 opal\`:H323=\"no\":" \
-			configure || die "sed failed"
-	fi
-
 	# V4L support is auto-enabled, want it to be a user choice
 	# do not contact upstream because that's a hack
 	# TODO: check if upstream has removed this hack