Version bump, drop old

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 21 insertions, 40 deletions

diff --git a/net-libs/libnice/ChangeLog b/net-libs/libnice/ChangeLog
index f0cadff7cdec..0559490a450a 100644
--- a/net-libs/libnice/ChangeLog
+++ b/net-libs/libnice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libnice
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnice/ChangeLog,v 1.77 2014/10/11 12:24:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnice/ChangeLog,v 1.78 2014/11/11 13:40:42 pacho Exp $
+
+*libnice-0.1.8 (11 Nov 2014)
+
+  11 Nov 2014; Pacho Ramos <pacho@gentoo.org> +libnice-0.1.8.ebuild,
+  -libnice-0.1.4-r1.ebuild, -libnice-0.1.4.ebuild:
+  Version bump, drop old
 
   11 Oct 2014; Markus Meier <maekke@gentoo.org> libnice-0.1.7.ebuild:
   arm stable, bug #512012
diff --git a/net-libs/libnice/libnice-0.1.4.ebuild b/net-libs/libnice/libnice-0.1.4.ebuild
deleted file mode 100644
index 9d72d2f5e6de..000000000000
--- a/net-libs/libnice/libnice-0.1.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnice/libnice-0.1.4.ebuild,v 1.10 2013/10/22 07:21:58 ago Exp $
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="An implementation of the Interactice Connectivity Establishment standard (ICE)"
-HOMEPAGE="http://nice.freedesktop.org/wiki/"
-SRC_URI="http://nice.freedesktop.org/releases/${P}.tar.gz"
-
-LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+upnp"
-
-RDEPEND=">=dev-libs/glib-2.13:2
-	upnp? ( >=net-libs/gupnp-igd-0.1.3:= )"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig"
-
-src_configure() {
-	# gstreamer plugin split off into media-plugins/gst-plugins-libnice
-	econf --disable-static \
-		--without-gstreamer \
-		--without-gstreamer-0.10 \
-		$(use_enable upnp gupnp)
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-}
diff --git a/net-libs/libnice/libnice-0.1.4-r1.ebuild b/net-libs/libnice/libnice-0.1.8.ebuild
index 5a8fa0908cd7..1ef6cf34ff15 100644
--- a/net-libs/libnice/libnice-0.1.4-r1.ebuild
+++ b/net-libs/libnice/libnice-0.1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnice/libnice-0.1.4-r1.ebuild,v 1.3 2014/06/24 22:16:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnice/libnice-0.1.8.ebuild,v 1.1 2014/11/11 13:40:42 pacho Exp $
 
 EAPI=5
 inherit eutils multilib-minimal
@@ -12,13 +12,21 @@ SRC_URI="http://nice.freedesktop.org/releases/${P}.tar.gz"
 LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+upnp"
+IUSE="+introspection +upnp"
 
-RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	upnp? ( >=net-libs/gupnp-igd-0.2.2-r1:=[${MULTILIB_USEDEP}] )"
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.30.0 )
+	upnp? ( >=net-libs/gupnp-igd-0.2.4:=[${MULTILIB_USEDEP}] )
+"
 DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+# Many tests fail from time to time, for example:
+# https://bugs.freedesktop.org/show_bug.cgi?id=81691
+RESTRICT="test"
 
 multilib_src_configure() {
 	# gstreamer plugin split off into media-plugins/gst-plugins-libnice
@@ -26,6 +34,7 @@ multilib_src_configure() {
 	econf --disable-static \
 		--without-gstreamer \
 		--without-gstreamer-0.10 \
+		$(use_enable introspection) \
 		$(use_enable upnp gupnp)
 
 	if multilib_is_native_abi; then