net-libs/ortp: version bump, using last ebuild in tree with linphone patch

svn path=/trunk/; revision=784

5 files changed, 55 insertions, 45 deletions

diff --git a/net-libs/ortp/ChangeLog b/net-libs/ortp/ChangeLog
index 9a08736..3449722 100644
--- a/net-libs/ortp/ChangeLog
+++ b/net-libs/ortp/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for net-libs/ortp
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-libs/ortp/ChangeLog,v 1.29 2008/02/12 21:39:09 vapier Exp $
 
+  23 Feb 2009; Mounir Lamouri (volkmar) <mounir.lamouri@gmail.com>
+  -ortp-0.13.1-r1.ebuild, +ortp-0.13.1-r2.ebuild:
+  Version bump to 0.13.1-r2: same as portage tree (-r1) with linphone patch
+
   19 Feb 2008; Chi-Thanh Christopher Nguyen <chithanh@cs.tu-berlin.de>
   +files/ortp-0.13.1-linphone-2.1.1.patch, +metadata.xml,
   +ortp-0.13.1-r1.ebuild:
diff --git a/net-libs/ortp/Manifest b/net-libs/ortp/Manifest
index bec5770..f72c8a1 100644
--- a/net-libs/ortp/Manifest
+++ b/net-libs/ortp/Manifest
@@ -1,5 +1,5 @@
 AUX ortp-0.13.1-linphone-2.1.1.patch 2671 RMD160 66671680f8cd51d029e4253f03c8712080733cff SHA1 2bba5aaf2be4cb8ccad6810efca3e07f40a5b176 SHA256 474f1f225238c5849a3025be1b87f16967448f5d72b482d2dc402fbdcdf9325c
 DIST ortp-0.13.1.tar.gz 455112 RMD160 f87c886526878d636012dbf2b8ae36c6161afb82 SHA1 27928c973b1bfbe4da999675a26d12e870e35e60 SHA256 2ba471a2a4f1d7f10fb70de5b68dbb7d32b43494efcecb88b3bd8445f630494c
-EBUILD ortp-0.13.1-r1.ebuild 1026 RMD160 2e67456919dce6d71f3b06ae9e81c3c6151e7006 SHA1 d3402ca3a7202e626f4c7aefef99b5817ce676cd SHA256 c32e0b20004b719402ac0eef0ec83c738c379f43359bc22e6309e36507f8a1ae
-MISC ChangeLog 3810 RMD160 5c747f543c7c24479024fd7a158566e1a53a3176 SHA1 d779466e5a6751597d4e7f78fc482d52c9b0d774 SHA256 1d1b91759b4d90e89c9b905f762d011f112849abce714c946e9e4c34b88bf222
-MISC metadata.xml 217 RMD160 275af641d8134ee438c8e2c9f89eb3b0a286a386 SHA1 7b349815d56d7d7e2d46968341228c5267c666eb SHA256 c3eb09d27b1a9cf05b690524903c7faf096829ef1d19c0264769c277ac28d0a1
+EBUILD ortp-0.13.1-r2.ebuild 1254 RMD160 5df6dd862be7db4f335e521c060a7e2d50c486ae SHA1 0100f15da5366e07df0dccd264301a4395adc49f SHA256 4fc9662b539c3abc846a85e3564e13d132c882ea544983948700a481e5a08984
+MISC ChangeLog 4004 RMD160 aa1b28e0193642f951fcbfb76334cb21269101af SHA1 092e9951ce82079b59c086c91b0a1abf5e463717 SHA256 c7700817fe43ed37000ad75e915feb2bdcc2dc843772b3b99a609ea1f6930034
+MISC metadata.xml 157 RMD160 cb900ea8bf389b8f6147746711462b5757752b16 SHA1 bbbbd897cfe8d8bac785b23bead8e185871055bd SHA256 6759dc127ff53f85505b9b455ba325e65015b694b1ec50eb99ddfc8903b967bf
diff --git a/net-libs/ortp/metadata.xml b/net-libs/ortp/metadata.xml
index a3cddc4..02207a5 100644
--- a/net-libs/ortp/metadata.xml
+++ b/net-libs/ortp/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>voip</herd>
-<maintainer>
-  <email>stkn@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/net-libs/ortp/ortp-0.13.1-r1.ebuild b/net-libs/ortp/ortp-0.13.1-r1.ebuild
deleted file mode 100644
index 2586eb3..0000000
--- a/net-libs/ortp/ortp-0.13.1-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ortp/ortp-0.13.1.ebuild,v 1.4 2008/02/12 21:39:09 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="Open Real-time Transport Protocol (RTP) stack"
-HOMEPAGE="http://www.linphone.org/index.php/v2/code_review/ortp/"
-SRC_URI="http://download.savannah.nongnu.org/releases/linphone/${PN}/sources/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="ipv6"
-
-DEPEND="=dev-libs/glib-2*
-	>=dev-util/pkgconfig-0.9.0"
-RDEPEND="=dev-libs/glib-2*"
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}" || die
-	epatch "${FILESDIR}"/ortp-0.13.1-linphone-2.1.1.patch
-}
-
-src_compile() {
-	econf \
-		--disable-strict \
-		$(use_enable ipv6) \
-		|| die 'configure failed'
-	emake || die 'make compile failed'
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Make install failed"
-	dodoc README ChangeLog AUTHORS TODO NEWS
-	dodoc docs/*.txt
-}
diff --git a/net-libs/ortp/ortp-0.13.1-r2.ebuild b/net-libs/ortp/ortp-0.13.1-r2.ebuild
new file mode 100644
index 0000000..a0c95ca
--- /dev/null
+++ b/net-libs/ortp/ortp-0.13.1-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Open Real-time Transport Protocol (RTP, RFC3550) stack"
+HOMEPAGE="http://www.linphone.org/index.php/eng/code_review/ortp/"
+SRC_URI="http://download.savannah.nongnu.org/releases/linphone/${PN}/sources/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc ipv6"
+
+DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND=""
+
+src_prepare() {
+	# to be sure doc is not compiled nor installed with -doc and doxygen inst
+	if ! use doc; then
+		sed -i -e 's/test $DOXYGEN != //' configure \
+			|| die "patching configure failed"
+	fi
+
+	epatch "${FILESDIR}"/${P}-linphone-2.1.1.patch
+}
+
+src_configure() {
+	# memcheck is for HP-UX only
+	# mode64bit adds +DA2.0W +DS2.0 CFLAGS wich are needed for HP-UX
+	# strict adds -Werror, don't want it
+	econf \
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		--disable-memcheck \
+		--disable-mode64bit \
+		--disable-strict \
+		--docdir=/usr/share/doc/${PF}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
+}