Version bump (bug #519038). Removed old

(Portage version: 2.2.11/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

4 files changed, 18 insertions, 59 deletions

diff --git a/media-libs/libdvdnav/ChangeLog b/media-libs/libdvdnav/ChangeLog
index d368d6d15d1b..acc4c4c5dd59 100644
--- a/media-libs/libdvdnav/ChangeLog
+++ b/media-libs/libdvdnav/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libdvdnav
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/ChangeLog,v 1.82 2014/06/18 19:41:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/ChangeLog,v 1.83 2014/08/04 16:56:27 polynomial-c Exp $
+
+*libdvdnav-5.0.0 (04 Aug 2014)
+
+  04 Aug 2014; Lars Wendler <polynomial-c@gentoo.org> -libdvdnav-4.2.0.ebuild,
+  -libdvdnav-4.2.0-r1.ebuild, +libdvdnav-5.0.0.ebuild, libdvdnav-9999.ebuild:
+  Version bump. Removed old. Thanks to Uwe L. Korn for reporting this in bug
+  #519038 and providing an ebuild patch.
 
   18 Jun 2014; Michał Górny <mgorny@gentoo.org> libdvdnav-4.2.0-r1.ebuild,
   libdvdnav-4.2.1.ebuild, libdvdnav-9999.ebuild:
diff --git a/media-libs/libdvdnav/libdvdnav-4.2.0.ebuild b/media-libs/libdvdnav/libdvdnav-4.2.0.ebuild
deleted file mode 100644
index 71775041aa86..000000000000
--- a/media-libs/libdvdnav/libdvdnav-4.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/libdvdnav-4.2.0.ebuild,v 1.9 2012/05/17 14:37:58 aballier Exp $
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="Library for DVD navigation tools"
-HOMEPAGE="http://dvdnav.mplayerhq.hu/"
-SRC_URI="http://dvdnav.mplayerhq.hu/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=media-libs/libdvdread-${PV}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig" # To get pkg.m4 for eautoreconf #414391
-
-DOCS=( AUTHORS ChangeLog DEVELOPMENT-POLICY.txt doc/dvd_structures NEWS README TODO )
-
-src_prepare() {
-	sed -i -e '/^CFLAGS/s:-O3::' configure.ac || die
-	epatch "${FILESDIR}"/${PN}-4.2.0-pkgconfig.patch
-	eautoreconf
-}
-
-src_install() {
-	default
-	rm -f "${ED}"usr/lib*/${PN}*.la
-}
diff --git a/media-libs/libdvdnav/libdvdnav-4.2.0-r1.ebuild b/media-libs/libdvdnav/libdvdnav-5.0.0.ebuild
index 107e116a747b..0ca5addf8ea0 100644
--- a/media-libs/libdvdnav/libdvdnav-4.2.0-r1.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-5.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/libdvdnav-4.2.0-r1.ebuild,v 1.2 2014/06/18 19:41:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/libdvdnav-5.0.0.ebuild,v 1.1 2014/08/04 16:56:27 polynomial-c Exp $
 
 EAPI=5
 
@@ -10,12 +10,11 @@ AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
 SCM=""
 
 if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="subversion"
-	ESVN_REPO_URI="svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav"
-	ESVN_PROJECT="libdvdnav"
+	SCM="git-r3"
+	EGIT_REPO_URI="git://git.videolan.org/libdvdnav.git"
 	SRC_URI=""
 else
-	SRC_URI="http://dvdnav.mplayerhq.hu/releases/${P}.tar.bz2"
+	SRC_URI="http://downloads.videolan.org/pub/videolan/libdvdnav/${PV}/${P}.tar.bz2"
 fi
 
 inherit autotools-multilib ${SCM}
@@ -37,11 +36,4 @@ RDEPEND=">=media-libs/libdvdread-4.2.0-r1[${MULTILIB_USEDEP}]
 DEPEND="${RDEPEND}
 	virtual/pkgconfig" # To get pkg.m4 for eautoreconf #414391
 
-DOCS=( AUTHORS ChangeLog DEVELOPMENT-POLICY.txt doc/dvd_structures NEWS README TODO )
-
-PATCHES=( "${FILESDIR}"/${PN}-4.2.0-pkgconfig.patch )
-
-src_prepare() {
-	[ "${PV#9999}" != "${PV}" ] && subversion_src_prepare
-	autotools-multilib_src_prepare
-}
+DOCS=( AUTHORS ChangeLog doc/dvd_structures doc/library_layout README TODO )
diff --git a/media-libs/libdvdnav/libdvdnav-9999.ebuild b/media-libs/libdvdnav/libdvdnav-9999.ebuild
index 6edb2e59084d..1ed9a32200bd 100644
--- a/media-libs/libdvdnav/libdvdnav-9999.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/libdvdnav-9999.ebuild,v 1.9 2014/06/18 19:41:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/libdvdnav-9999.ebuild,v 1.10 2014/08/04 16:56:27 polynomial-c Exp $
 
 EAPI=5
 
@@ -10,12 +10,11 @@ AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
 SCM=""
 
 if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="subversion"
-	ESVN_REPO_URI="svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav"
-	ESVN_PROJECT="libdvdnav"
+	SCM="git-r3"
+	EGIT_REPO_URI="git://git.videolan.org/libdvdnav.git"
 	SRC_URI=""
 else
-	SRC_URI="http://dvdnav.mplayerhq.hu/releases/${P}.tar.bz2"
+	SRC_URI="http://downloads.videolan.org/pub/videolan/libdvdnav/${PV}/${P}.tar.bz2"
 fi
 
 inherit autotools-multilib ${SCM}
@@ -37,11 +36,4 @@ RDEPEND=">=media-libs/libdvdread-4.2.0-r1[${MULTILIB_USEDEP}]
 DEPEND="${RDEPEND}
 	virtual/pkgconfig" # To get pkg.m4 for eautoreconf #414391
 
-DOCS=( AUTHORS ChangeLog DEVELOPMENT-POLICY.txt doc/dvd_structures NEWS README TODO )
-
-PATCHES=( "${FILESDIR}"/${PN}-4.2.0-pkgconfig.patch )
-
-src_prepare() {
-	[ "${PV#9999}" != "${PV}" ] && subversion_src_prepare
-	autotools-multilib_src_prepare
-}
+DOCS=( AUTHORS ChangeLog doc/dvd_structures doc/library_layout README TODO )