Version bump

Package-Manager: portage-2.2.0_alpha138/cvs/Linux i686
Manifest-Sign-Key: 0x748B2C601F6F0683

3 files changed, 187 insertions, 5 deletions

diff --git a/net-voip/ekiga/ChangeLog b/net-voip/ekiga/ChangeLog
index 70ec93b008a9..968b0b94ab0f 100644
--- a/net-voip/ekiga/ChangeLog
+++ b/net-voip/ekiga/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-voip/ekiga
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ChangeLog,v 1.39 2012/10/24 21:49:34 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ChangeLog,v 1.40 2012/11/09 01:06:18 neurogeek Exp $
+
+*ekiga-3.9.90 (08 Nov 2012)
+
+  08 Nov 2012; Jesus Rivero <neurogeek@gentoo.org> +ekiga-3.9.90.ebuild:
+  Version bump
 
   24 Oct 2012; Jesus Rivero <neurogeek@gentoo.org> ekiga-3.2.7.ebuild:
   Restricting net-libs/ptlib and net-libs/opal DEPS to avoid selecting the new
diff --git a/net-voip/ekiga/Manifest b/net-voip/ekiga/Manifest
index bea61480e76c..8a74714579b8 100644
--- a/net-voip/ekiga/Manifest
+++ b/net-voip/ekiga/Manifest
@@ -9,14 +9,16 @@ AUX ekiga-eggtrayicon-update.diff 13969 SHA256 1db286369b81677d559b38261ce5f6686
 AUX not-gnome.patch 413 SHA256 6287ffec378a85425ecd0b4f6ea9b445c3151c7259d130630de63f88dbd69c8d SHA512 db83ebff097133095da33b76a68cd347a659c55207f69badc2a1c7a2a53d3f12e06cba19fdd63be1a786cb604700a8543075d154fd9a5ecb502d0e58ce010ecc WHIRLPOOL 0a3079802e58d066d3019567f272075a3933920287aa727e2724348db31034658ae93c288aa7d232c9a1adec8a2188f59748370452da392de560cc108a2e514b
 DIST ekiga-2.0.12.tar.bz2 6109264 SHA256 5747802480b44a3cde8fd52f381b1761db52354d74fce7df380a2fbaa71910e9 SHA512 ba45588868b16c94ea1627a59fc68945c1fdf67806c6e97c17da014882eb16c9ce5d72232adfa14d6a5925d6c7535847de8d0098e79801535d15a116a3268ccb WHIRLPOOL 9bc02fba5e5d3c173536900c8805c0ca4a73bda153c06aed4df10668d34ac30ea0d8b89fdd234edc2f1a77092b2d2a77560024fe6e17d005d4f86212c7e4fc20
 DIST ekiga-3.2.7.tar.bz2 9093433 SHA256 f25a1309b68eafe69f0d7aed461bc9a8196939060543d09bd2f19e0bb1e3fd8f SHA512 faf55fd8b3ca0b520723651e2e0cff005364126d6c3d92ca1c07dc18c0b9fda298d9378e70a4110487748083db6408d63e855942995c01783936d899f3da7a44 WHIRLPOOL f531f06280e139fb7131bab9ef63c2cbabe4be2af95c63230e972c668ee38b9e15a407c34369cb614cc668fd9f3792e62c7191b96887828435a225fb3ec65b04
+DIST ekiga-3.9.90.tar.xz 8306552 SHA256 d905169c257173196d235bad6501682cd07752a6a29577620cc4dfb91d8b77a9 SHA512 efe5e0e3767e98aa6302cc6b73e2b897656df2e364ab02956028e5290f640ad1ca9d9aa276f6b7ce217ab9711040515d902ff172bee283fce7b0057ec67f7ed9 WHIRLPOOL 4c333c04cba65a53c49dfa6817867653962a0092fbd0927d16242d327136b4ec08ffcd56115daa36f6168078243632211c5d9c7838f093d9ada3fcf250274024
 EBUILD ekiga-2.0.12.ebuild 2356 SHA256 f8b63f940a2bcf7fdc00201d5d56ee1e98a2bdcf61447df6766e2b499619efec SHA512 d2eb3f57b3c72c25ad1af079c227f14b2074cce01b85c4189e9ed486d98f292af1eb996f3dd2b7be2622ecb76bb2ad27d5b00334f1bfa6831f2fb437e7a0d80d WHIRLPOOL a619e9e92b2cd49705f1ec48299fb7244da313dd6415afb77d8e1f554f636e57c9375a19b7135017352cd970388aa5f675abdee87e05b80107f2692bb9652b1c
 EBUILD ekiga-3.2.7.ebuild 4957 SHA256 6f15bc0f7b819cfdad8aeee0b294e970cf54792cacfea1287ea88c4ed167d9e0 SHA512 01d6d6efc09e30e60e11d8b687d96bdbf7d579d9c524472dcd3012341b73572519581807db390b7d8fdb574419ed504f7305385980d42d0d855171741937170d WHIRLPOOL fd0f3ef2eb8bc14f0c34ec453174b1cd48858b4d4d3bc28f23dca47660ede0b933c2cfb4b18ee2180afa9498a5926e924f9fe840e9a683c68e8be091397f5195
-MISC ChangeLog 13709 SHA256 3c9e3e3c9392ca8d74006b6419c0b9d28dee4f58c43646db874515c7c3a98ffd SHA512 a271ba9de1e8a97a4ff98ac9da925a54f77072f2eddd14fefc7acbdeb7815189b7d9d0a78c5d027f5509b0b82dc4852e631e1199da9476c5f97bc0d127c1c9d6 WHIRLPOOL d45af099f5289aa3a1c5d3fb284cd405c140bee61bbba4092e33ecb4daeaf272a44cb62889aa0beb34938653be0d1e500f1209d130b4ebc266f0ccc4c13c3041
+EBUILD ekiga-3.9.90.ebuild 4922 SHA256 06313046a43e428fc0d1c9e48d2d201141c45ba85ceb8840678ef334214b3fec SHA512 87af230e3f3a482633ceadbeb9aa105fa8cc8cdbfbc5517ffe822aef9ebccb52bfab67805a21762ae5cee43ce54875af786618d7000c0a6d6411dd9eb4b78f11 WHIRLPOOL 7feefb88923213dea1be0f1104f8b6181e979942512cdd722297ee90f791dece3414086411ade55415a68b496c76e58dfd4ac1bb9cedad9dd6d87a2de7fc5040
+MISC ChangeLog 13827 SHA256 25ce69bcbb4f5be22aba3f0110a4522028ce4bfa807894ed31eb485f3affcc7d SHA512 b6304301924b6a5a0e827d164438ba6bcf21aa846a0ff753688fde3d0dc30cb9032394f46e334597719dce64ba5cb6e37fae4b27d3007e08197fb2ac3435ab62 WHIRLPOOL c36186a331c15e2073e777343019b49e83285f8cea72ccc6b7e3e3af702750b39da377ecb169a00238af9249059a4cf3e7dba0af3fde180e9b0f249b2ee5eddb
 MISC metadata.xml 626 SHA256 bbb61b4e3af296733e8e607a9e6e31f7cbde0259ae25824af8c8b230b4e8454b SHA512 f819aad088f884ad488201ec6734f1fced9b1fe41e7c3512793615faf6c00b478ddc6c066af75f58e6149c34501700f8d44d303b75de89b5902f2e9ee2389380 WHIRLPOOL 1837f4d4256f5e107d16e592b8bdbb9dad91d89b0187a6360d43f5f37579c253af431e669e96b0e7ecc9e499fe50745d939ec23a58b92911c141d0fe56f1ba69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAlCIKiQACgkQdIssYB9vBoN7FgCeOocaH3bZ7fugXZlI/emCTgMS
-4nIAn2HY55Tvf+lje7N7I9Up1i0A9Qlv
-=24O5
+iEYEAREIAAYFAlCcEL4ACgkQdIssYB9vBoPapQCfV4KuY+ZOCca6eakl0TS8Ohnh
+E1UAmgKVuIf0I4HKdb5y3N5hHzRnVq38
+=4zu8
 -----END PGP SIGNATURE-----
diff --git a/net-voip/ekiga/ekiga-3.9.90.ebuild b/net-voip/ekiga/ekiga-3.9.90.ebuild
new file mode 100644
index 000000000000..c46522f69bdf
--- /dev/null
+++ b/net-voip/ekiga/ekiga-3.9.90.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ekiga-3.9.90.ebuild,v 1.1 2012/11/09 01:06:18 neurogeek Exp $
+
+EAPI="4"
+
+KDE_REQUIRED="optional"
+CMAKE_REQUIRED="never"
+GCONF_DEBUG="no" # debug managed by the ebuild
+
+inherit eutils kde4-base gnome2
+# gnome2 at the end to make it default
+
+DESCRIPTION="H.323 and SIP VoIP softphone"
+HOMEPAGE="http://www.ekiga.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~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.14.0:2
+	>=dev-libs/boost-1.49
+	dev-libs/libxml2:2
+	>=net-libs/opal-3.10.8[audio,sip,video,debug=,h323?]
+	>=net-libs/ptlib-2.10.8[ldap?,stun,v4l?,video,wav,debug=,dtmf]
+	>=x11-libs/gtk+-2.12.0:2
+	avahi? ( >=net-dns/avahi-0.6[dbus] )
+	dbus? ( >=sys-apps/dbus-0.36
+		>=dev-libs/dbus-glib-0.36 )
+	eds? ( >=gnome-extra/evolution-data-server-1.2 )
+	gconf? ( >=gnome-base/gconf-2.6.0:2 )
+	gnome? ( || ( >=x11-libs/gtk+-2.14:2
+		( >=gnome-base/libgnome-2.14.0
+		>=gnome-base/libgnomeui-2.14.0 ) ) )
+	gstreamer? ( >=media-libs/gst-plugins-base-0.10.21.3:0.10 )
+	kde? ( kontact? ( $(add_kdebase_dep kdepimlibs) ) )
+	ldap? ( dev-libs/cyrus-sasl:2
+		net-nds/openldap )
+	libnotify? ( x11-libs/libnotify )
+	shm? ( x11-libs/libXext )
+	xcap? ( net-libs/libsoup:2.4 )
+	xv? ( x11-libs/libXv )"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+	sys-devel/gettext
+	doc? ( app-text/scrollkeeper
+		app-text/gnome-doc-utils
+		app-doc/doxygen )
+	v4l? ( sys-kernel/linux-headers )"
+
+DOCS="AUTHORS ChangeLog FAQ MAINTAINERS NEWS README TODO"
+
+# NOTES:
+# having >=gtk+-2.14 is actually removing need of +gnome but it's clearer to
+# 	represent it with || in gnome dep
+# 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
+# +doc is not installing dev doc (doxygen)
+
+# UPSTREAM:
+# contact ekiga team to be sure intltool and gettext are not nls deps
+
+pkg_setup() {
+	forceconf=""
+
+	if use kde; then
+		kde4-base_pkg_setup
+	fi
+
+	if use kontact && ! use kde; then
+		ewarn "To enable kontact USE flag, you need kde USE flag to be enabled."
+		ewarn "If you need kontact support, please, re-emerge with kde enabled."
+		forceconf="${forceconf} --disable-kab"
+	fi
+
+	# dbus-service: always enable if dbus is enabled, no reason to disable it
+	# schemas-install: install gconf schemas
+	G2CONF="${G2CONF}
+		--disable-dependency-tracking
+		--disable-maintainer-mode
+		--enable-libtool-lock
+		$(use_enable avahi)
+		$(use_enable dbus)
+		$(use_enable dbus dbus_service)
+		$(use_enable debug gtk-debug)
+		$(use_enable debug opal-debug)
+		$(use_enable doc gdu)
+		$(use_enable eds)
+		$(use_enable gconf)
+		$(use_enable gconf schemas-install)
+		$(use_enable gstreamer)
+		$(use_enable h323)
+		$(use_enable kde)
+		$(use_enable kontact kab)
+		$(use_enable ldap)
+		$(use_enable libnotify notify)
+		$(use_enable mmx)
+		$(use_enable nls)
+		$(use_enable shm)
+		$(use_enable static static-libs)
+		$(use_enable xcap)
+		$(use_enable xv)
+		${forceconf}"
+}
+
+src_prepare() {
+
+	gnome2_src_prepare
+
+	# 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 "sed failed"
+
+	# 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
+	if ! use v4l; then
+		sed -i -e "s/V4L=\"enabled\"/V4L=\"disabled\"/" configure \
+			|| die "sed failed"
+	fi
+
+	# compatibility with kdeprefix, fix bug 283033
+	if use kde; then
+		sed -i -e "s:\tKDE_CFLAGS=\(.*\):\tKDE_CFLAGS=\"\1 -I${KDEDIR}/include\":" \
+			configure || die "sed failed"
+		sed -i -e "s:\(KDE_LIBS=.*\)\(-lkdeui\):\1-L${KDEDIR}/$(get_libdir) \2:" \
+			configure || die "sed failed"
+	fi
+
+	# Remove silly -D*_DISABLE_DEPRECATED CFLAGS
+	sed -e 's/-D[^\s\t]\+_DISABLE_DEPRECATED//g' -i configure || die
+}
+
+src_test() {
+	# must be explicit because kde4-base in exporting a src_test function
+	emake -j1 check || die "emake check failed"
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use doc && use dbus; then
+		insinto "/usr/share/doc/${PF}/"
+		doins doc/using_dbus.html || die "doins failed"
+	fi
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if use kde; then
+		kde4-base_pkg_postinst
+	fi
+
+	if ! use gnome; then
+		ewarn "USE=-gnome is experimental, weirdness with UI and config keys can appear."
+	fi
+
+	if use gstreamer || use kde || use xcap || use kontact; then
+		ewarn "You have enabled gstreamer, kde, xcap or kontact USE flags."
+		ewarn "Those USE flags are considered experimental features."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if use kde; then
+		kde4-base_pkg_postrm
+	fi
+}