Fix gcc-4.4 compilation issue. Move to EAPI-2. Cleaning. Fix bug 277762.

(Portage version: 13845-svn/cvs/Linux i686)

5 files changed, 32 insertions, 35 deletions

diff --git a/dev-libs/jrtplib/ChangeLog b/dev-libs/jrtplib/ChangeLog
index e8f89f317f93..28856e009f4b 100644
--- a/dev-libs/jrtplib/ChangeLog
+++ b/dev-libs/jrtplib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/jrtplib
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/jrtplib/ChangeLog,v 1.6 2008/12/16 08:38:15 pva Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/jrtplib/ChangeLog,v 1.7 2009/07/23 15:01:32 volkmar Exp $
+
+*jrtplib-3.7.1-r1 (23 Jul 2009)
+
+  23 Jul 2009; Mounir Lamouri <volkmar@gentoo.org>
+  +files/jrtplib-3.7.1-gcc-4.4.patch, metadata.xml, -jrtplib-3.5.2.ebuild,
+  -jrtplib-3.7.1.ebuild, +jrtplib-3.7.1-r1.ebuild:
+  Fix gcc-4.4 compilation issue. Move to EAPI-2. Cleaning. Fix bug 277762
 
   16 Dec 2008; Peter Volkov <pva@gentoo.org>
   +files/jrtplib-3.7.1-gcc43.patch, jrtplib-3.7.1.ebuild:
diff --git a/dev-libs/jrtplib/files/jrtplib-3.7.1-gcc-4.4.patch b/dev-libs/jrtplib/files/jrtplib-3.7.1-gcc-4.4.patch
new file mode 100644
index 000000000000..ecbce3568063
--- /dev/null
+++ b/dev-libs/jrtplib/files/jrtplib-3.7.1-gcc-4.4.patch
@@ -0,0 +1,10 @@
+--- src/rtpdefines.h.old	2009-07-23 16:55:04.000000000 +0000
++++ src/rtpdefines.h	2009-07-23 16:55:35.000000000 +0000
+@@ -79,6 +79,7 @@
+ 		#define RTP_SNPRINTF _snprintf
+ 	#endif
+ #else
++	#include <stdio.h>
+ 	#define RTP_SNPRINTF snprintf
+ #endif // WIN32 || _WIN32_WCE
+ 
diff --git a/dev-libs/jrtplib/jrtplib-3.5.2.ebuild b/dev-libs/jrtplib/jrtplib-3.5.2.ebuild
deleted file mode 100644
index 043bb346f79d..000000000000
--- a/dev-libs/jrtplib/jrtplib-3.5.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/jrtplib/jrtplib-3.5.2.ebuild,v 1.2 2006/10/08 18:05:37 blubb Exp $
-
-DESCRIPTION="JRTPLIB is an object-oriented RTP library written in C++."
-HOMEPAGE="http://research.edm.luc.ac.be/jori/jrtplib/jrtplib.html"
-SRC_URI="http://research.edm.luc.ac.be/jori/jrtplib/${P}.tar.bz2"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/jthread"
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc README.TXT TODO ChangeLog doc/jrtplib.tex
-}
diff --git a/dev-libs/jrtplib/jrtplib-3.7.1.ebuild b/dev-libs/jrtplib/jrtplib-3.7.1-r1.ebuild
index 7c393d04f546..3c25912d8ab1 100644
--- a/dev-libs/jrtplib/jrtplib-3.7.1.ebuild
+++ b/dev-libs/jrtplib/jrtplib-3.7.1-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/jrtplib/jrtplib-3.7.1.ebuild,v 1.2 2008/12/16 08:38:15 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/jrtplib/jrtplib-3.7.1-r1.ebuild,v 1.1 2009/07/23 15:01:32 volkmar Exp $
+
+EAPI="2"
 
 inherit eutils
 
@@ -16,23 +18,23 @@ IUSE="examples ipv6"
 RDEPEND="dev-libs/jthread"
 DEPEND="${RDEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gcc43.patch"
+src_prepare() {
+	# do not compile examples
+	sed -i -e "s/examples //" Makefile.in || die "sed failed"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+	epatch "${FILESDIR}"/${P}-gcc-4.4.patch
 }
 
-src_compile() {
+src_configure() {
 	econf $(use_enable ipv6 IPv6)
-	emake || die "emake failed."
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ChangeLog README* TODO
+	dodoc ChangeLog README.TXT TODO || die "dodoc failed"
 
 	if use examples; then
 		insinto /usr/share/${PN}/examples
-		doins examples/*.cpp
+		doins examples/*.cpp || die "doins failed"
 	fi
 }
diff --git a/dev-libs/jrtplib/metadata.xml b/dev-libs/jrtplib/metadata.xml
index f17efa9dc226..43cc20ba7f03 100644
--- a/dev-libs/jrtplib/metadata.xml
+++ b/dev-libs/jrtplib/metadata.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-	<maintainer>
-		<email>voip@gentoo.org</email>
-		<description>dependency of Tapioca</description>
-	</maintainer>
+	<herd>voip</herd>
 </pkgmetadata>