Version bump for bug 223927. Fix desktop entry for bug 204319. Try to handle LINGUAS for bug 204322. Missing deps for bug 205020.

Package-Manager: portage-2.1.5.3

5 files changed, 89 insertions, 56 deletions

diff --git a/app-cdr/dvd95/ChangeLog b/app-cdr/dvd95/ChangeLog
index de94624ff5a1..caa6836f1f45 100644
--- a/app-cdr/dvd95/ChangeLog
+++ b/app-cdr/dvd95/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-cdr/dvd95
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvd95/ChangeLog,v 1.4 2007/12/16 21:15:59 pylon Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvd95/ChangeLog,v 1.5 2008/06/06 20:32:37 drac Exp $
+
+*dvd95-1.3_p2 (06 Jun 2008)
+
+  06 Jun 2008; Samuli Suominen <drac@gentoo.org>
+  +files/dvd95-1.3_p2-desktop-entry.patch, -dvd95-1.2_p0.ebuild,
+  +dvd95-1.3_p2.ebuild:
+  Version bump for bug 223927. Fix desktop entry for bug 204319. Try to
+  handle LINGUAS for bug 204322. Missing deps for bug 205020.
 
 *dvd95-1.3_p0 (16 Dec 2007)
 
diff --git a/app-cdr/dvd95/Manifest b/app-cdr/dvd95/Manifest
index 08ae24f15851..ccf6e5edbc2a 100644
--- a/app-cdr/dvd95/Manifest
+++ b/app-cdr/dvd95/Manifest
@@ -1,6 +1,7 @@
-DIST dvd95-1.2p0.tar.gz 685814 RMD160 a3c0fe158c4169cdbe86eb9d9e9c185fc2cb2cec SHA1 773880b0a255dd18608c8437357c2b826455dbb2 SHA256 c8a4f0cd5f0a4669b813cfa346b54d27d4d314f9622fcac16f79883371cdb39b
+AUX dvd95-1.3_p2-desktop-entry.patch 522 RMD160 3b8bbe7853a58c84c1e5f1bcb81189ba17afa26e SHA1 4d8b272c62627ae618626bdd368bc2b844ba5da0 SHA256 44e5defe46b5cd613f9de6fa3658e1a7788381b3e7a702024fd99de0b16e2a6e
 DIST dvd95-1.3p0.tar.gz 734423 RMD160 fa8a7fa55b941d618bc069e6351d13e7e2fcd088 SHA1 3fae8bc9af0a888354435fac543755a7bea5e98e SHA256 75c54d9ce7855c903ffdc0d46ce59810a44059990ecbf0d427100bf0ee130643
-EBUILD dvd95-1.2_p0.ebuild 1217 RMD160 e6b3eaaa48f696ef85cd930078983b178349ece5 SHA1 9cad2ba62d3b692f2d30e36c7b1c12ff0dc9ba19 SHA256 755f7df8990addf6e448db7bdc47f7f2b0a97449ef9d11d079ef4be1a7db31dc
+DIST dvd95-1.3p2.tar.gz 741802 RMD160 5bf50f4da0b53264e9274a236e12603044ccad98 SHA1 0fd64147f2351854d7f9e19ca424120f641d0f98 SHA256 89362a754296f76131f9237d5553991e8868afded19905fca9b2b2150f3cdf5d
 EBUILD dvd95-1.3_p0.ebuild 1238 RMD160 fe26a126eb67474524fd139a613f80e9409f781f SHA1 2b03c7ef6b8433f591f11b6c85ba8918242c0d01 SHA256 8d81d00efcb8122d8cf3ee7e40a077ae94c116e9b5150ae3028b6596e6ee969d
-MISC ChangeLog 767 RMD160 f22f53d415e74e11b868f3e3d0911e3f81f921a6 SHA1 0d515becc857687860dd5f97ceccea64ec2b985e SHA256 fc9141888e53ea1cb93ed5f5dbcb1cd0ded81ca67eb48b43e413380f2c816a63
+EBUILD dvd95-1.3_p2.ebuild 1512 RMD160 7464be5389af722abc8cb3b635636fc315a147fd SHA1 f6a5ee0892cf9c64f6b4020ea3a5402d836db7ac SHA256 5834e34b726fb5bb4cc1ddea743e168c9edc4e3b6d5a291935683cc92a867617
+MISC ChangeLog 1068 RMD160 f9fa76a9cdaf6a4ab6a2d8b4cd8e1c36d10f0714 SHA1 ffc74863c7f3d3cb510e1468df078a1f8d43a9d5 SHA256 7e3f20230b915512e6f6945576bb6d74f591cc3e66d00635cae56a7f1555902d
 MISC metadata.xml 166 RMD160 02ca0a5d9279c1b52c3887f5a1f52f3feb002af9 SHA1 b9fccc7c24aa717c30efef068fd544a692f264f6 SHA256 ce62d1e5b04e01d03a732ee6d33b3d500810de8e55af4a527c970e5b475735d8
diff --git a/app-cdr/dvd95/dvd95-1.2_p0.ebuild b/app-cdr/dvd95/dvd95-1.2_p0.ebuild
deleted file mode 100644
index e18e3b02acf9..000000000000
--- a/app-cdr/dvd95/dvd95-1.2_p0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvd95/dvd95-1.2_p0.ebuild,v 1.3 2007/12/16 21:15:59 pylon Exp $
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="DVD95 is a Gnome application to convert DVD9 to DVD5."
-HOMEPAGE="http://dvd95.sourceforge.net/"
-SRC_URI="mirror://sourceforge/dvd95/${MY_P/_/}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE_LINGUAS="linguas_en linguas_fr"
-IUSE="${IUSE_LINGUAS} mmx 3dnow sse sse2"
-
-DEPEND="gnome-base/libgnomeui
-	media-libs/libdvdread"
-
-RDEPEND="gnome-base/libgnomeui
-	media-libs/libdvdread"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i "s#prefix = /usr/local#prefix = /usr#" po/Makefile.in
-}
-
-src_compile() {
-	# This package provides en and fr for LINGUAS.
-	# Default language is French, but switch to English if no LINGUAS is set.
-
-	if [ -z "${LINGUAS}" ]; then
-		export LINGUAS="en"
-	fi
-
-	econf $(use_enable mmx) \
-		$(use_enable 3dnow) \
-		$(use_enable sse) \
-		$(use_enable sse2) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/app-cdr/dvd95/dvd95-1.3_p2.ebuild b/app-cdr/dvd95/dvd95-1.3_p2.ebuild
new file mode 100644
index 000000000000..4eb9333c8bcb
--- /dev/null
+++ b/app-cdr/dvd95/dvd95-1.3_p2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvd95/dvd95-1.3_p2.ebuild,v 1.1 2008/06/06 20:32:37 drac Exp $
+
+inherit eutils
+
+DESCRIPTION="DVD95 is a Gnome application to convert DVD9 to DVD5."
+HOMEPAGE="http://dvd95.sourceforge.net/"
+SRC_URI="mirror://sourceforge/dvd95/${P/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE_LINGUAS="linguas_de linguas_nl linguas_hu linguas_el linguas_cs
+linguas_pt_BR linguas_et_EE linguas_es"
+IUSE="${IUSE_LINGUAS} mmx 3dnow sse sse2 mpeg"
+
+RDEPEND="gnome-base/libgnomeui
+	media-libs/libdvdread
+	mpeg? ( media-libs/libmpeg2 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+S=${WORKDIR}/${P/_}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e "s#prefix = /usr/local#prefix = /usr#" \
+		po/Makefile.in || die "sed failed."
+
+	epatch "${FILESDIR}"/${P}-desktop-entry.patch
+}
+
+src_compile() {
+	# Default language is French, but switch to English if no LINGUAS is set.
+	if [[ -z ${LINGUAS} ]]; then
+		export LINGUAS="en"
+	fi
+
+	econf --disable-dependency-tracking \
+		$(use_enable mmx) \
+		$(use_enable 3dnow) \
+		$(use_enable sse) \
+		$(use_enable sse2) \
+		$(use_enable mpeg libmpeg2)
+
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog TODO
+
+	for lang in de nl hu el cs pt_BR es et_EE; do
+		use linguas_${lang} || rm -rf "${D}"/usr/share/locale/${lang}
+	done
+}
diff --git a/app-cdr/dvd95/files/dvd95-1.3_p2-desktop-entry.patch b/app-cdr/dvd95/files/dvd95-1.3_p2-desktop-entry.patch
new file mode 100644
index 000000000000..e33662d26618
--- /dev/null
+++ b/app-cdr/dvd95/files/dvd95-1.3_p2-desktop-entry.patch
@@ -0,0 +1,16 @@
+diff -ur dvd95-1.3p2.orig/dvd95.desktop dvd95-1.3p2/dvd95.desktop
+--- dvd95-1.3p2.orig/dvd95.desktop	2007-04-10 22:53:38.000000000 +0300
++++ dvd95-1.3p2/dvd95.desktop	2008-06-06 22:53:00.000000000 +0300
+@@ -3,10 +3,9 @@
+ Comment=DVD9 to DVD5 converter
+ Comment[fr]=Convertisseur DVD9 vers DVD5
+ Exec=dvd95
+-Icon=dvd95/dvd9548.png
++Icon=/usr/share/pixmaps/dvd95/dvd9548.png
+ Terminal=false
+ Type=Application
+-Encoding=UTF-8
+-Categories=Application;AudioVideo;
++Categories=AudioVideo;
+ X-Desktop-File-Install-Version=0.10
+