Version bump, remove old.

(Portage version: 2.1.9.50/cvs/Linux x86_64)

4 files changed, 18 insertions, 67 deletions

diff --git a/net-libs/sofia-sip/ChangeLog b/net-libs/sofia-sip/ChangeLog
index 9f02160b9b79..25811cb4666a 100644
--- a/net-libs/sofia-sip/ChangeLog
+++ b/net-libs/sofia-sip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/sofia-sip
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/sofia-sip/ChangeLog,v 1.16 2010/08/07 16:38:44 armin76 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/sofia-sip/ChangeLog,v 1.17 2011/06/15 19:22:10 pacho Exp $
+
+*sofia-sip-1.12.11 (15 Jun 2011)
+
+  15 Jun 2011; Pacho Ramos <pacho@gentoo.org> -sofia-sip-1.12.5.ebuild,
+  -sofia-sip-1.12.8.ebuild, -sofia-sip-1.12.9.ebuild,
+  +sofia-sip-1.12.11.ebuild:
+  Version bump, remove old.
 
   07 Aug 2010; Raúl Porcel <armin76@gentoo.org> sofia-sip-1.12.10.ebuild:
   ia64/sparc stable wrt #328733
diff --git a/net-libs/sofia-sip/sofia-sip-1.12.9.ebuild b/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
index 64d0c5215459..9eccf624b466 100644
--- a/net-libs/sofia-sip/sofia-sip-1.12.9.ebuild
+++ b/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/sofia-sip/sofia-sip-1.12.9.ebuild,v 1.4 2010/04/16 18:16:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild,v 1.1 2011/06/15 19:22:10 pacho Exp $
+
+EAPI="4"
 
 DESCRIPTION="RFC3261 compliant SIP User-Agent library"
 HOMEPAGE="http://sofia-sip.sourceforge.net/"
@@ -11,17 +13,13 @@ LICENSE="LGPL-2.1"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE="ssl"
 
-RDEPEND="dev-libs/glib
+RDEPEND="dev-libs/glib:2
 	ssl? ( dev-libs/openssl )"
 DEPEND="${RDEPEND}"
 
-src_compile() {
-	econf $(use_with ssl openssl) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+# tests are broken, see bugs 304607 and 330261
+RESTRICT="test"
 
-	dodoc ChangeLog COPYRIGHTS README TODO
+src_configure() {
+	econf $(use_with ssl openssl)
 }
diff --git a/net-libs/sofia-sip/sofia-sip-1.12.5.ebuild b/net-libs/sofia-sip/sofia-sip-1.12.5.ebuild
deleted file mode 100644
index a2daf97e860d..000000000000
--- a/net-libs/sofia-sip/sofia-sip-1.12.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/sofia-sip/sofia-sip-1.12.5.ebuild,v 1.3 2010/04/16 18:16:27 armin76 Exp $
-
-DESCRIPTION="RFC3261 compliant SIP User-Agent library"
-HOMEPAGE="http://sofia-sip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~ia64 ~sparc ~x86"
-IUSE="ssl"
-
-RDEPEND="dev-libs/glib
-	ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	econf $(use_with ssl openssl) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc ChangeLog COPYRIGHTS README TODO
-}
diff --git a/net-libs/sofia-sip/sofia-sip-1.12.8.ebuild b/net-libs/sofia-sip/sofia-sip-1.12.8.ebuild
deleted file mode 100644
index fa8e4ac385a9..000000000000
--- a/net-libs/sofia-sip/sofia-sip-1.12.8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/sofia-sip/sofia-sip-1.12.8.ebuild,v 1.3 2010/04/16 18:16:27 armin76 Exp $
-
-DESCRIPTION="RFC3261 compliant SIP User-Agent library"
-HOMEPAGE="http://sofia-sip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~ia64 ~sparc ~x86"
-IUSE="ssl"
-
-RDEPEND="dev-libs/glib
-	ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	econf $(use_with ssl openssl) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc ChangeLog COPYRIGHTS README TODO
-}