Bump

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

3 files changed, 185 insertions, 2 deletions

diff --git a/net-voip/ekiga/ChangeLog b/net-voip/ekiga/ChangeLog
index f948372720a2..b5764d14f23f 100644
--- a/net-voip/ekiga/ChangeLog
+++ b/net-voip/ekiga/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-voip/ekiga
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ChangeLog,v 1.52 2013/08/15 02:40:49 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ChangeLog,v 1.53 2013/08/26 11:51:11 patrick Exp $
+
+*ekiga-4.0.1 (26 Aug 2013)
+
+  26 Aug 2013; Patrick Lauer <patrick@gentoo.org> +ekiga-4.0.1.ebuild:
+  Bump
 
   15 Aug 2013; Patrick Lauer <patrick@gentoo.org> ekiga-2.0.12.ebuild:
   Fixing src_unpack / src_prepare
diff --git a/net-voip/ekiga/Manifest b/net-voip/ekiga/Manifest
index 5718b2b4ae91..c29905173069 100644
--- a/net-voip/ekiga/Manifest
+++ b/net-voip/ekiga/Manifest
@@ -7,8 +7,10 @@ AUX not-gnome.patch 413 SHA256 6287ffec378a85425ecd0b4f6ea9b445c3151c7259d130630
 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-4.0.0.tar.xz 8332828 SHA256 69c544fb0f2e9cb425b9dae131b01e256ad20fd597f1faf0c28f5930b0f1d998 SHA512 0760b4ba2b037bb829809a92d67a6281c85746286fc2393cfaaf7a84520acac11e68b18d2c5bb98e0eeec70171a991b3bba1ca7dd7d275a29cea97b52fab960f WHIRLPOOL ea3f92433755bb2cec2a075c65074082b6cc684ef41117fd1c8ff0545446e85c09a3e6d3311e3489fef66528f10fe6d254b396f1eeadfa753d05806f57f738d8
+DIST ekiga-4.0.1.tar.xz 8339364 SHA256 5f4f491c9496cf65ba057a9345d6bb0278f4eca07bcda5baeecf50bfcd9a4a3b SHA512 3c4dd5eab6e91434da4bbfe5728ac5943ed5ae89b8b2241fb59abb3e41bcd08ba187b5d60c9d839b1010edd7fc97b53cc6db57a6eec40ba81757a772febd2217 WHIRLPOOL 10f60d34b110f0bd77631725bcd7be2badaa88e7278c466a5d2f2944a7ad6226d4466cf6f1f2f3fdea3a3ea925b02216052124dfc5ca416439ba60db22a809ed
 EBUILD ekiga-2.0.12.ebuild 2375 SHA256 1fff6cc0a89cab326a8c7535a7f8505d961fe23aa70629fcab89facd1ee10784 SHA512 1bf33523ac727a5e57789448c35d6b0a5f51dd51a6b90399079a8f6d4b93507b604860b8bfe60c21ca6726ad41eeb41b0d921f3fefabb0505e39177e6162fe3e WHIRLPOOL 99bb731a172f8eddf8aec3a4353fa36a2502a1690b12ac0ad104ac8a653f3d08b0ffc0ded9678bebb98aa32c5a186f44d57e8521a3e3ff0893bfdb6006d231d4
 EBUILD ekiga-3.2.7.ebuild 4934 SHA256 374fe14f83fdcfe987f41dfdf673710905ec5949965bc1dfb0b7d8b4e9eab47c SHA512 c79861797e5688101842354dd75ef11cc01d2da15d33d6ab533e02c1c8a49dd140926fa037fab508cd6c847b852e5b9640fc217c85bb24d652e1ce37b97c32a4 WHIRLPOOL f8b7bfe18b77f00512ab5b8f34bfccf6507b9483d70249f73da3b2d6e58cb8197073fc9a16b5bbbc03dd1d966f196fd05edb81ca8a7b4ac12d523c72212451f8
 EBUILD ekiga-4.0.0-r1.ebuild 4982 SHA256 522c7ab6d6c09fe7260935fd5b0c4f03b9daef356791bbd891c5b76a17e8c45d SHA512 0c843518025c614ec6f7dcb702621e873a230b78f54f62ba6f1e5c839018177c873494435f07eee33ca04b9fd9dbf62dd323b56c4c77794a4a4ad5a1e74a0522 WHIRLPOOL 57e37adca31472de687b89eddbd1e33ae00c249a1402d820ef57005cbc7231f2256fff22839de23e68e2013ca5e059c4c38c23fea4e95e7fe65f4f44ef0fb816
-MISC ChangeLog 15202 SHA256 c089e8d286c0e7e6eaa78eacaaf7380ade5a74f1a5e8c86e5518b532d0f5714f SHA512 1f3933b1bec84626f6fbc9432d3e54ec0652c3f9bacd1870f121bc2ea4782224f87fede02b9d1447a41e427099ba8102f84c67f4b8f7d240d23b6388423b27d3 WHIRLPOOL fc645b8496a87cf6ac026c687298514e028766adbcb770eeee9ba731a71284181172efd880f6c16c10ec9acf86d0d7cbd32b63bbfb9207b875b49dcf80e05fcb
+EBUILD ekiga-4.0.1.ebuild 4989 SHA256 70b81b8d2241c4102bf355f4d247e9a66362355b19d5ba7fa648345da3350005 SHA512 9b22fa05d149fca2d088ef180a5a0b4ea8fcd391b5f49ab634dcabcdc44239413fdff046c36877f44caa25649482d5ad225a7b3dc42bbd95e508a7535f7c39d9 WHIRLPOOL 53683ec4b7b2516750149340ec6e3a3f82a645c101d934e6c57784fd54a5a136d859ee09a83ff3d13bdb6a03f468922270352b41e14cdfc2971bd575a3ff871a
+MISC ChangeLog 15309 SHA256 e07f5c6f949ca7e094a63c281af7d58ec08f146faeb0cbf57767231c850c0fcc SHA512 cb9429470809facbe2d29ab41246be0d4b2c1f8a4fbfc126d6735be4b43950110170d98e0b6fd70beebe0e814413c2940445117dfe6ce279cbeb19705105f9c0 WHIRLPOOL 2d253d00b86e5b7a721083743da490d0fcdd4860e00f3bffc10bb3984e99fe506ca90d38a497656d4751e89bc68093b863cbc073d508515769d7a371f5bb5c7e
 MISC metadata.xml 626 SHA256 6d233b0454391ae9ee835d015d9e6d173ada60b2762d2f225282d20ebcd9de3f SHA512 1cc1a74e48c00b1d8042207583db3acd548ca7eaacbe287d3e74d50c57207ae26502980639a55f49cc488a6f6f0a5c2e2ce80476ffab29e3ca10fa7236c4b4dc WHIRLPOOL d8088b7eb34f7f28ddd2a23e688cad1e269f00253546c50fd263b60b5d8a56325c78f45cfebe55d4843249cb45f17c92cedbbfbdd53124d4f0bd48769564e813
diff --git a/net-voip/ekiga/ekiga-4.0.1.ebuild b/net-voip/ekiga/ekiga-4.0.1.ebuild
new file mode 100644
index 000000000000..2f6dc568687a
--- /dev/null
+++ b/net-voip/ekiga/ekiga-4.0.1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ekiga-4.0.1.ebuild,v 1.1 2013/08/26 11:51:11 patrick 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 pulseaudio +shm static v4l xcap xv"
+
+RDEPEND=">=dev-libs/glib-2.24.0:2
+	>=dev-libs/boost-1.49
+	dev-libs/libxml2:2
+	>=net-libs/opal-3.10.9[audio,sip,video,debug=,h323?,xml]
+	>=net-libs/ptlib-2.10.9[ldap?,stun,v4l?,video,wav,debug=,dtmf,pulseaudio?,xml]
+	>=x11-libs/gtk+-2.20.0:2
+	>=x11-themes/gnome-icon-theme-3.0.0
+	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.20.0: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
+}