forgotten commit

(Portage version: 2.1.4.4)

6 files changed, 79 insertions, 38 deletions

diff --git a/net-libs/ccrtp/ChangeLog b/net-libs/ccrtp/ChangeLog
index fc87db35cc4f..95f7c71d9d9a 100644
--- a/net-libs/ccrtp/ChangeLog
+++ b/net-libs/ccrtp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/ccrtp
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ccrtp/ChangeLog,v 1.13 2007/08/15 23:52:24 dertobi123 Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ccrtp/ChangeLog,v 1.14 2008/05/10 10:03:57 dragonheart Exp $
+
+*ccrtp-1.6.0 (01 May 2008)
+
+  01 May 2008; Daniel Black <dragonheart@gentoo.org>
+  +files/ccrtp-stdlib.patch, -ccrtp-1.4.1.ebuild, ccrtp-1.5.0.ebuild,
+  ccrtp-1.5.1.ebuild, +ccrtp-1.6.0.ebuild:
+  version bump. Patch for stdlib to defile rand as per bug #219102 fixes
+  gcc-4.3 compilation error thanks to Redeeman
 
   15 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org> ccrtp-1.5.0.ebuild:
   ppc stable, bug #182353
diff --git a/net-libs/ccrtp/ccrtp-1.4.1.ebuild b/net-libs/ccrtp/ccrtp-1.4.1.ebuild
deleted file mode 100644
index 9bf8ca38db6f..000000000000
--- a/net-libs/ccrtp/ccrtp-1.4.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ccrtp/ccrtp-1.4.1.ebuild,v 1.3 2007/08/11 02:25:06 beandog Exp $
-
-inherit multilib
-
-DESCRIPTION="GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF"
-HOMEPAGE="http://www.gnu.org/software/ccrtp/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-LICENSE="GPL-2"
-IUSE=""
-SLOT="0"
-
-DEPEND=">=dev-cpp/commoncpp2-1.3.0"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR=${D} install || die
-	dodoc README ChangeLog AUTHORS NEWS TODO
-}
-
-pkg_postinst() {
-	if [[ -e ${ROOT}/usr/$(get_libdir)/libccrtp1-1.3.so.0 ]] ; then
-		ewarn
-		ewarn "Please run: revdep-rebuild --library libccrtp1-1.3.so.0"
-		ewarn
-	fi
-}
diff --git a/net-libs/ccrtp/ccrtp-1.5.0.ebuild b/net-libs/ccrtp/ccrtp-1.5.0.ebuild
index 41eb98c64946..ecbcd820ff34 100644
--- a/net-libs/ccrtp/ccrtp-1.5.0.ebuild
+++ b/net-libs/ccrtp/ccrtp-1.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ccrtp/ccrtp-1.5.0.ebuild,v 1.6 2007/08/15 23:52:24 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ccrtp/ccrtp-1.5.0.ebuild,v 1.7 2008/05/10 10:03:57 dragonheart Exp $
 
-inherit multilib
+inherit multilib eutils
 
 DESCRIPTION="GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF"
 HOMEPAGE="http://www.gnu.org/software/ccrtp/"
@@ -19,6 +19,12 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9.0
 	doc? ( app-doc/doxygen )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-stdlib.patch
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc README ChangeLog AUTHORS NEWS TODO
diff --git a/net-libs/ccrtp/ccrtp-1.5.1.ebuild b/net-libs/ccrtp/ccrtp-1.5.1.ebuild
index 6d0b64999432..da1a8a89c0a0 100644
--- a/net-libs/ccrtp/ccrtp-1.5.1.ebuild
+++ b/net-libs/ccrtp/ccrtp-1.5.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ccrtp/ccrtp-1.5.1.ebuild,v 1.2 2007/08/11 02:25:06 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ccrtp/ccrtp-1.5.1.ebuild,v 1.3 2008/05/10 10:03:57 dragonheart Exp $
 
-inherit multilib
+inherit multilib eutils
 
 DESCRIPTION="GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF"
 HOMEPAGE="http://www.gnu.org/software/ccrtp/"
@@ -19,6 +19,12 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9.0
 	doc? ( app-doc/doxygen )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-stdlib.patch
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc README ChangeLog AUTHORS NEWS TODO
diff --git a/net-libs/ccrtp/ccrtp-1.6.0.ebuild b/net-libs/ccrtp/ccrtp-1.6.0.ebuild
new file mode 100644
index 000000000000..75b8330d6386
--- /dev/null
+++ b/net-libs/ccrtp/ccrtp-1.6.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ccrtp/ccrtp-1.6.0.ebuild,v 1.1 2008/05/10 10:03:57 dragonheart Exp $
+
+inherit multilib eutils
+
+DESCRIPTION="GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF"
+HOMEPAGE="http://www.gnu.org/software/ccrtp/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+LICENSE="GPL-2"
+IUSE="doc"
+SLOT="0"
+
+RDEPEND=">=dev-cpp/commoncpp2-1.3.0
+	dev-libs/libgcrypt"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9.0
+	doc? ( app-doc/doxygen )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-stdlib.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README ChangeLog AUTHORS NEWS TODO
+	use doc && dohtml -r doc/html/*
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/usr/$(get_libdir)/libccrtp1-1.4.so.0 ]] ; then
+		elog "Please run: revdep-rebuild --library libccrtp1-1.4.so.0"
+	fi
+	if [[ -e "${ROOT}"/usr/$(get_libdir)/libccrtp1-1.5.so.0 ]] ; then
+		elog "Please run: revdep-rebuild --library libccrtp1-1.5.so.0"
+	fi
+}
diff --git a/net-libs/ccrtp/files/ccrtp-stdlib.patch b/net-libs/ccrtp/files/ccrtp-stdlib.patch
new file mode 100644
index 000000000000..074a30f8f044
--- /dev/null
+++ b/net-libs/ccrtp/files/ccrtp-stdlib.patch
@@ -0,0 +1,10 @@
+--- src/control.cpp.orig	2008-05-01 23:14:09.000000000 +1000
++++ src/control.cpp	2008-05-01 23:14:21.000000000 +1000
+@@ -43,6 +43,7 @@
+ 
+ #include "private.h"
+ #include <ccrtp/cqueue.h>
++#include <stdlib.h>
+ 
+ #ifdef  CCXX_NAMESPACES
+ namespace ost {