Version bump. Drop old.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 9 insertions, 239 deletions

diff --git a/media-libs/mediastreamer/ChangeLog b/media-libs/mediastreamer/ChangeLog
index 3e291f79018c..6561ba73988e 100644
--- a/media-libs/mediastreamer/ChangeLog
+++ b/media-libs/mediastreamer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/mediastreamer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/ChangeLog,v 1.26 2010/05/21 06:30:23 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/ChangeLog,v 1.27 2010/06/07 14:44:54 pva Exp $
+
+*mediastreamer-2.5.0 (07 Jun 2010)
+
+  07 Jun 2010; Peter Volkov <pva@gentoo.org> -mediastreamer-2.2.4.ebuild,
+  -mediastreamer-2.3.0.ebuild, -mediastreamer-2.4.0.ebuild,
+  +mediastreamer-2.5.0.ebuild:
+  Version bump. Drop old.
 
   21 May 2010; Peter Volkov <pva@gentoo.org> mediastreamer-2.4.0.ebuild:
   mediastreamer-2.4.0 requires ortp-0.16.2, bug 320751, thank Nikoli for
diff --git a/media-libs/mediastreamer/mediastreamer-2.2.4.ebuild b/media-libs/mediastreamer/mediastreamer-2.2.4.ebuild
deleted file mode 100644
index 9f77a0e58586..000000000000
--- a/media-libs/mediastreamer/mediastreamer-2.2.4.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.2.4.ebuild,v 1.3 2009/11/15 13:56:03 volkmar Exp $
-
-EAPI="2"
-
-inherit eutils autotools multilib
-
-DESCRIPTION="Mediastreaming library for telephony application"
-HOMEPAGE="http://www.linphone.org/index.php/eng/code_review/mediastreamer2"
-SRC_URI="http://download.savannah.nongnu.org/releases/linphone/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+alsa debug doc examples gsm ilbc ipv6 jack oss portaudio +speex theora video x264 X"
-
-RDEPEND=">=net-libs/ortp-0.15.0_p1
-	alsa? ( media-libs/alsa-lib )
-	gsm? ( media-sound/gsm )
-	jack? ( media-libs/libsamplerate
-		media-sound/jack-audio-connection-kit )
-	portaudio? ( media-libs/portaudio )
-	speex? ( >=media-libs/speex-1.2_beta3 )
-	video? ( media-libs/libsdl[video,X]
-		media-video/ffmpeg
-		theora? ( media-libs/libtheora )
-		X? ( x11-libs/libX11 ) )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-PDEPEND="ilbc? ( media-plugins/mediastreamer-ilbc )
-	video? ( x264? ( media-plugins/mediastreamer-x264 ) )"
-
-# TODO:
-# run-time test for ipv6 : does it need ortp[ipv6] ?
-
-# NOTES:
-# in some way, v4l support is auto-magic but keeping it like that atm
-
-pkg_setup() {
-	if ! use oss && ! use alsa && ! use jack && ! use portaudio;
-	then
-		eerror "You must enable at least oss, alsa, jack or portaudio"
-		eerror "Please, re-emerge ${PN} with one of this USE flag enabled"
-		die
-	fi
-
-	if ! use video && ( use theora || use X ); then
-		ewarn "X and theora support are enabled if video USE flag is enabled"
-		ewarn "If you want X or theora support, consider re-emerge with USE=\"video\""
-	fi
-}
-
-src_prepare() {
-	# too hard to have a flexible lib dir in a clean way
-	sed -i -e "s:\(/usr/kde/3.5/\)lib:\1$(get_libdir):" configure.ac \
-		|| die "patching configure.ac failed"
-
-	# respect user's CFLAGS
-	sed -i -e "s:-O2::" configure.ac || die "patching configure.ac failed"
-
-	# change default paths
-	sed -i -e "s:\(\${prefix}/\)lib:\1$(get_libdir):" \
-		-e "s:\(prefix/share\):\1/${PN}:" configure.ac \
-		|| die "patching configure.ac failed"
-
-	# fix html doc installation dir
-#	sed -i -e "s:\$(pkgdocdir):\$(docdir):" help/Makefile.am \
-#		|| die "patching help/Makefile.am failed"
-	sed -i -e "s:\(doc_htmldir=\).*:\1\$(htmldir):" help/Makefile.am \
-		|| die "patching help/Makefile.am failed"
-
-	eautoreconf
-
-	# don't build examples in tests/
-	sed -i -e "s:\(SUBDIRS = .*\) tests \(.*\):\1 \2:" Makefile.in \
-		|| die "patching Makefile.in failed"
-}
-
-src_configure() {
-	# strict: don't want -Werror
-	# macsnd and macaqsnd: macosx related
-	# external-ortp: don't use bundled libs
-	# arts: arts is deprecated
-	econf \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--datadir=/usr/share/${PN} \
-		--libdir=/usr/$(get_libdir) \
-		--disable-strict \
-		--disable-macsnd \
-		--disable-macaqsnd \
-		--enable-external-ortp \
-		--disable-dependency-tracking \
-		--disable-artsc \
-		$(use_enable alsa) \
-		$(use_enable debug) \
-		$(use_enable doc) \
-		$(use_enable gsm) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable oss) \
-		$(use_enable portaudio) \
-		$(use_enable speex) \
-		$(use_enable theora) \
-		$(use_enable video) \
-		$(use_enable X x11)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins tests/*.c || die "doins failed"
-	fi
-}
diff --git a/media-libs/mediastreamer/mediastreamer-2.3.0.ebuild b/media-libs/mediastreamer/mediastreamer-2.3.0.ebuild
deleted file mode 100644
index e6eeeaea11cc..000000000000
--- a/media-libs/mediastreamer/mediastreamer-2.3.0.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.3.0.ebuild,v 1.2 2010/02/23 06:51:31 josejx Exp $
-
-EAPI="2"
-
-inherit eutils autotools multilib
-
-DESCRIPTION="Mediastreaming library for telephony application"
-HOMEPAGE="http://www.linphone.org/index.php/eng/code_review/mediastreamer2"
-SRC_URI="http://download.savannah.nongnu.org/releases/linphone/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+alsa debug examples gsm ilbc ipv6 jack oss portaudio +speex theora video x264 X"
-
-RDEPEND=">=net-libs/ortp-0.15.0_p1
-	alsa? ( media-libs/alsa-lib )
-	gsm? ( media-sound/gsm )
-	jack? ( media-libs/libsamplerate
-		media-sound/jack-audio-connection-kit )
-	portaudio? ( media-libs/portaudio )
-	speex? ( >=media-libs/speex-1.2_beta3 )
-	video? ( media-libs/libsdl[video,X]
-		media-video/ffmpeg
-		theora? ( media-libs/libtheora )
-		X? ( x11-libs/libX11 ) )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-PDEPEND="ilbc? ( media-plugins/mediastreamer-ilbc )
-	video? ( x264? ( media-plugins/mediastreamer-x264 ) )"
-
-# TODO:
-# run-time test for ipv6 : does it need ortp[ipv6] ?
-
-# NOTES:
-# in some way, v4l support is auto-magic but keeping it like that atm
-
-pkg_setup() {
-	if ! use oss && ! use alsa && ! use jack && ! use portaudio;
-	then
-		eerror "You must enable at least oss, alsa, jack or portaudio"
-		eerror "Please, re-emerge ${PN} with one of this USE flag enabled"
-		die
-	fi
-
-	if ! use video && ( use theora || use X ); then
-		ewarn "X and theora support are enabled if video USE flag is enabled"
-		ewarn "If you want X or theora support, consider re-emerge with USE=\"video\""
-	fi
-}
-
-src_prepare() {
-	# too hard to have a flexible lib dir in a clean way
-	sed -i -e "s:\(/usr/kde/3.5/\)lib:\1$(get_libdir):" configure.ac \
-		|| die "patching configure.ac failed"
-
-	# respect user's CFLAGS
-	sed -i -e "s:-O2::" configure.ac || die "patching configure.ac failed"
-
-	# change default paths
-	sed -i -e "s:\(\${prefix}/\)lib:\1$(get_libdir):" \
-		-e "s:\(prefix/share\):\1/${PN}:" configure.ac \
-		|| die "patching configure.ac failed"
-
-	# fix html doc installation dir
-#	sed -i -e "s:\$(pkgdocdir):\$(docdir):" help/Makefile.am \
-#		|| die "patching help/Makefile.am failed"
-	sed -i -e "s:\(doc_htmldir=\).*:\1\$(htmldir):" help/Makefile.am \
-		|| die "patching help/Makefile.am failed"
-
-	eautoreconf
-
-	# don't build examples in tests/
-	sed -i -e "s:\(SUBDIRS = .*\) tests \(.*\):\1 \2:" Makefile.in \
-		|| die "patching Makefile.in failed"
-}
-
-src_configure() {
-	# strict: don't want -Werror
-	# macsnd and macaqsnd: macosx related
-	# external-ortp: don't use bundled libs
-	# arts: arts is deprecated
-	econf \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--datadir=/usr/share/${PN} \
-		--libdir=/usr/$(get_libdir) \
-		--disable-strict \
-		--disable-macsnd \
-		--disable-macaqsnd \
-		--enable-external-ortp \
-		--disable-dependency-tracking \
-		--disable-artsc \
-		$(use_enable alsa) \
-		$(use_enable debug) \
-		$(use_enable gsm) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable oss) \
-		$(use_enable portaudio) \
-		$(use_enable speex) \
-		$(use_enable theora) \
-		$(use_enable video) \
-		$(use_enable X x11)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins tests/*.c || die "doins failed"
-	fi
-}
diff --git a/media-libs/mediastreamer/mediastreamer-2.4.0.ebuild b/media-libs/mediastreamer/mediastreamer-2.5.0.ebuild
index 3ded1cc426f3..752531032958 100644
--- a/media-libs/mediastreamer/mediastreamer-2.4.0.ebuild
+++ b/media-libs/mediastreamer/mediastreamer-2.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.4.0.ebuild,v 1.3 2010/05/21 06:30:23 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.5.0.ebuild,v 1.1 2010/06/07 14:44:54 pva Exp $
 
 EAPI="3"