Version bump for bug 121722.

Package-Manager: portage-2.1.5.4

4 files changed, 66 insertions, 65 deletions

diff --git a/app-cdr/dvdshrink/ChangeLog b/app-cdr/dvdshrink/ChangeLog
index d80981944a18..6263b37e98b9 100644
--- a/app-cdr/dvdshrink/ChangeLog
+++ b/app-cdr/dvdshrink/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/dvdshrink
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvdshrink/ChangeLog,v 1.9 2006/12/17 23:19:17 kugelfang Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvdshrink/ChangeLog,v 1.10 2008/06/07 06:12:41 drac Exp $
+
+*dvdshrink-2.6.1_p10 (07 Jun 2008)
+
+  07 Jun 2008; Samuli Suominen <drac@gentoo.org> -dvdshrink-2.6.1-r1.ebuild,
+  +dvdshrink-2.6.1_p10.ebuild:
+  Version bump for bug 121722.
 
   17 Dec 2006; Danny van Dyk <kugelfang@gentoo.org>
   dvdshrink-2.6.1-r1.ebuild, dvdshrink-2.6.1_p8.ebuild:
diff --git a/app-cdr/dvdshrink/Manifest b/app-cdr/dvdshrink/Manifest
index beaafbfe20a7..f8cb6e4a46a0 100644
--- a/app-cdr/dvdshrink/Manifest
+++ b/app-cdr/dvdshrink/Manifest
@@ -1,6 +1,6 @@
-DIST dvdshrink-2.6.1-6mdk.tar.gz 1087369 RMD160 d2cd29cb16c583c375d76e4dd686748797097198 SHA1 d8ab2d20e584064a56b8ffc5e5404b39d0ae5a0c SHA256 6046c3c966a9cd8a2f62594b036298238d1edb05a85f8b2012c08f0b98bf1693
+DIST dvdshrink-2.6.1-10mdk.tar.gz 1087571 RMD160 311c8074bf82eec164ac7c10938a772dca9519e3 SHA1 f57673c83818d25c3d051f5507b8204caceef691 SHA256 bbc30055130e3179490d8d48fb8cea7ad649c4704c55e4d93abf832ab43d78e9
 DIST dvdshrink-2.6.1-8mdk.tar.gz 1087395 RMD160 1d08b4ac54d5e9aa03a5085262fafef98db67573 SHA1 b288258596c4948df0f2d022c8fa45da9cdb6c8b SHA256 fa44e008c31db644b85b342af70187d77a308261d6e33882c49a98c6518dfcb4
-EBUILD dvdshrink-2.6.1-r1.ebuild 1785 RMD160 af4879efa7757de6d4fc78789461815c2e4b8846 SHA1 ec12940baaba901dee71e32e1bc0220529a138ea SHA256 9c02b62c9eb2d08724f6a24cf08b7d6ffb023b25feedb3e0e0b0cd806ebd1ed5
+EBUILD dvdshrink-2.6.1_p10.ebuild 1422 RMD160 0f14007b758e23e21a29706ba138557dd2803d0c SHA1 4f19c729ca29ce01f4d6e461bd027d1929eaa8d5 SHA256 27b14270800bf7f9c647e77693b3372ad9e5f53532f7c4b52673fa525edd632a
 EBUILD dvdshrink-2.6.1_p8.ebuild 1788 RMD160 49a43033a4b8c565cc61e6d6646b541878a63aa9 SHA1 16cc9013c4fde62617b0dcb1d5c66758b5f9df31 SHA256 0226f797f418e9c28ff01675f0e502f8ad8e6d246af77cc354a76f766f98e7c4
-MISC ChangeLog 1639 RMD160 8e5d09ea9fed3c5471e84d048ba5e05f6b0e395c SHA1 f75fd1ef500c64e8e20c3851cbc1620d1b625045 SHA256 b768241c11ef7f2da8e9aad0adfc87bdfd948ba2855035a2a163251b1545a815
+MISC ChangeLog 1811 RMD160 6d542b9854db80f2427858633856ce97e65c120f SHA1 768526ad7164e300f94d9ff0307d63c9d59d3c3e SHA256 704d690a4b40149f52cb083052b77c412ff6789721d55e75380fa6ea9d5f028f
 MISC metadata.xml 346 RMD160 cbfefd095df606e393bc1df9035c90038143c488 SHA1 e0299bb255563bbf627a8cca0d44ffe5a93829ed SHA256 96230e127ecb7e1472216733c7c88c170d06794d7119bc789e7046da8d8eebfa
diff --git a/app-cdr/dvdshrink/dvdshrink-2.6.1-r1.ebuild b/app-cdr/dvdshrink/dvdshrink-2.6.1-r1.ebuild
deleted file mode 100644
index b6af7f9cd5c3..000000000000
--- a/app-cdr/dvdshrink/dvdshrink-2.6.1-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvdshrink/dvdshrink-2.6.1-r1.ebuild,v 1.6 2007/07/13 05:40:32 mr_bones_ Exp $
-
-inherit eutils
-
-DESCRIPTION="Scriptable DVD copy software"
-HOMEPAGE="http://dvdshrink.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-6mdk.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="X"
-
-KEYWORDS="~amd64 ~x86 ~ppc"
-S="${WORKDIR}/${PN}"
-
-RDEPEND=">=media-video/transcode-1.0.2-r2
-	>=media-video/mjpegtools-1.8.0-r1
-	>=media-video/subtitleripper-0.3.4-r1
-	>=media-video/dvdauthor-0.6.11
-	>=app-cdr/dvd+rw-tools-6.1
-	X? ( >=dev-perl/gtk2-perl-1.104 )
-	>=app-text/gocr-0.40
-	virtual/cdrtools"
-
-pkg_setup() {
-	if ! built_with_use media-video/transcode dvdread; then
-		einfo "Please re-emerge transcode with the dvdread USE flag."
-		die  "transcode needs dvdread support builtin."
-	fi
-}
-
-src_install() {
-
-	dobin ./usr/bin/dvdshrink || die "Install of dvdshrink failed"
-	if use X ; then
-		dobin ./usr/bin/xdvdshrink.pl || die "Install of xdvdshrink.pl failed"
-	fi
-
-	dobin ./usr/bin/dvdsfunctions || die "Install of dvdsfunctions failed"
-	dobin ./usr/bin/batchrip.sh || die "Install of batchrip.sh failed"
-
-	insinto /usr/share/dvdshrink
-	doins usr/share/applications/dvdshrink/xdvdshrink_logo.png
-
-	insinto /usr/share/dvdshrink/menus
-	doins usr/share/applications/dvdshrink/menus/*.mpg
-
-	insinto /usr/share/dvdshrink/32x32
-	doins usr/share/applications/dvdshrink/32x32/dvdsrhink.xpm
-
-	insinto /usr/share/dvdshrink/64x64
-	doins usr/share/applications/dvdshrink/64x64/dvdshrink.xpm
-
-	dodoc usr/share/doc/dvdshrink/{INSTALL,README.txt,batchrip.txt,example.xml,gpl.txt}
-
-	insinto /usr/share/icons/dvdshrink
-	doins usr/share/icons/{batchrip.xpm,dvdshrink.xpm}
-}
diff --git a/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild b/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild
new file mode 100644
index 000000000000..da8216b98da1
--- /dev/null
+++ b/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild,v 1.1 2008/06/07 06:12:41 drac Exp $
+
+inherit eutils
+
+DESCRIPTION="Scriptable DVD copy software"
+HOMEPAGE="http://dvdshrink.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}mdk.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gtk"
+
+RDEPEND=">=media-video/transcode-1.0.2-r2
+	>=media-video/mjpegtools-1.8.0-r1
+	>=media-video/subtitleripper-0.3.4-r1
+	>=media-video/dvdauthor-0.6.11
+	>=app-cdr/dvd+rw-tools-6.1
+	gtk? ( >=dev-perl/gtk2-perl-1.104 )
+	>=app-text/gocr-0.40
+	virtual/cdrtools"
+DEPEND=""
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	if ! built_with_use media-video/transcode dvdread; then
+		eerror "Please re-emerge transcode with the dvdread USE flag."
+		die  "transcode needs dvdread support"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -e 's:applications/::g' -i usr/bin/dvdsfunctions \
+		-i usr/bin/xdvdshrink.pl || die "sed failed."
+}
+
+src_install() {
+	dobin usr/bin/{batchrip.sh,dvds{functions,hrink}} || die "dobin failed."
+
+	if use gtk; then
+		dobin usr/bin/xdvdshrink.pl || die "dobin failed."
+	fi
+
+	insinto /usr/share
+	doins -r usr/share/applications/dvdshrink
+
+	dodoc usr/share/doc/dvdshrink/{batchrip.txt,example.xml,README.txt}
+
+	doicon usr/share/icons/{batchrip.xpm,dvdshrink.xpm}
+}