Added patch to work with libdvdread-0.9.6, requested in Bug #138525. General ebuild cleanup.

Package-Manager: portage-2.1.1_rc1-r2

4 files changed, 48 insertions, 16 deletions

diff --git a/media-video/chaplin/ChangeLog b/media-video/chaplin/ChangeLog
index 9a633ea0b205..be53eafdfe4e 100644
--- a/media-video/chaplin/ChangeLog
+++ b/media-video/chaplin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/chaplin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/chaplin/ChangeLog,v 1.6 2006/08/21 17:58:56 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/chaplin/ChangeLog,v 1.7 2006/08/30 13:41:34 zzam Exp $
+
+  30 Aug 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/chaplin-1.10-libdvdread-0.9.6.patch, chaplin-1.10-r1.ebuild:
+  Added patch to work with libdvdread-0.9.6, requested in Bug #138525. General
+  ebuild cleanup.
 
 *chaplin-1.10-r1 (21 Aug 2006)
 
diff --git a/media-video/chaplin/Manifest b/media-video/chaplin/Manifest
index 6818514696ac..03676d8a7559 100644
--- a/media-video/chaplin/Manifest
+++ b/media-video/chaplin/Manifest
@@ -1,12 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX chaplin-1.10-libdvdread-0.9.6.patch 334 RMD160 04df4270c6f0a4e87a9cfc7e77f7b90c63968f03 SHA1 de79ffe2de1e2e96f77cdbd36b69a21eda73ef47 SHA256 853967d7caa5a0921f3147ab0ae23f99e8fd1933906711fe028ad2c5463d5cdb
+MD5 10e24587832f44b761775475b5e8a8cc files/chaplin-1.10-libdvdread-0.9.6.patch 334
+RMD160 04df4270c6f0a4e87a9cfc7e77f7b90c63968f03 files/chaplin-1.10-libdvdread-0.9.6.patch 334
+SHA256 853967d7caa5a0921f3147ab0ae23f99e8fd1933906711fe028ad2c5463d5cdb files/chaplin-1.10-libdvdread-0.9.6.patch 334
 DIST chaplin-1.10.tgz 23843 RMD160 2a24075486edd52b5ed24254b5ff9a8d845bf4fc SHA1 864fe0942998f79044f3cb3ce8decc8831edbcfe SHA256 064d3226d003477ae81273cee3870b5797f647623f67eb05e5c1e2e910d89228
-EBUILD chaplin-1.10-r1.ebuild 808 RMD160 64240d54c4b17c5e2e133785d3d9ea21f656b35e SHA1 629025458180d3314b1b785377f965208e4206a1 SHA256 f0cddec9651f015908c1ddfba17abc5200210ddb9d0715ca25dece5b545fc6af
-MD5 9c3ca80c9bfb3654727c85c8f2277fb5 chaplin-1.10-r1.ebuild 808
-RMD160 64240d54c4b17c5e2e133785d3d9ea21f656b35e chaplin-1.10-r1.ebuild 808
-SHA256 f0cddec9651f015908c1ddfba17abc5200210ddb9d0715ca25dece5b545fc6af chaplin-1.10-r1.ebuild 808
-MISC ChangeLog 862 RMD160 23d7b7c34c6e2407627a5f1e6d9d29f594bc94ac SHA1 3de7f9f7a57f24fda5c27cf2edb6e9593fce6d51 SHA256 3e00802457efa5273fd2499db743a778a55de26594d17e12189f5eee9d7580df
-MD5 acad6dd22d89493e9a2c5366254ef40b ChangeLog 862
-RMD160 23d7b7c34c6e2407627a5f1e6d9d29f594bc94ac ChangeLog 862
-SHA256 3e00802457efa5273fd2499db743a778a55de26594d17e12189f5eee9d7580df ChangeLog 862
+EBUILD chaplin-1.10-r1.ebuild 903 RMD160 9ba261ae8d66541938ea87cf622df1a7e04b4250 SHA1 75c647810adc3d3be672eab8c2970fab0995d334 SHA256 bb8dc7436dd67319d171734fea26047f8902f62bc5c455936fdf217141ac7488
+MD5 2383674ddfd2ffa57a26a930cd37559f chaplin-1.10-r1.ebuild 903
+RMD160 9ba261ae8d66541938ea87cf622df1a7e04b4250 chaplin-1.10-r1.ebuild 903
+SHA256 bb8dc7436dd67319d171734fea26047f8902f62bc5c455936fdf217141ac7488 chaplin-1.10-r1.ebuild 903
+MISC ChangeLog 1080 RMD160 713c984096dc7a8b1dfb4b35cb7638a7ebe04c5b SHA1 f1d12296fb6d826c4bfc652f7740a12b7b9c0832 SHA256 190d606dc13eb8063a2d8d244b577f5326ab0f702fbb4270b3f0f6d722e7c14d
+MD5 084a6d06cb2f9bec0532d5f084b87675 ChangeLog 1080
+RMD160 713c984096dc7a8b1dfb4b35cb7638a7ebe04c5b ChangeLog 1080
+SHA256 190d606dc13eb8063a2d8d244b577f5326ab0f702fbb4270b3f0f6d722e7c14d ChangeLog 1080
 MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a
 MD5 446c2ccebfd17f0cf3aa8e8d8b815635 metadata.xml 233
 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 metadata.xml 233
@@ -14,3 +21,10 @@ SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a metadata
 MD5 09368e92a9135dd5dc52228aa56634ce files/digest-chaplin-1.10-r1 226
 RMD160 2a00c74f07c78bb5a7fb880311e65aba42e9bbf2 files/digest-chaplin-1.10-r1 226
 SHA256 27c989e829deac1c6c013b933a7741b85d9fae6cb223863510edcfc9b3f6eb14 files/digest-chaplin-1.10-r1 226
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFE9ZWXt2vP6XvVdOcRAv4lAKDiEfKMH9ZgxhiS9ny1wI9UQ6Ti9QCgpbQb
+icb2hY1etPfhG172V/hVzO0=
+=lOGX
+-----END PGP SIGNATURE-----
diff --git a/media-video/chaplin/chaplin-1.10-r1.ebuild b/media-video/chaplin/chaplin-1.10-r1.ebuild
index 5ef0e4b1cc02..e1b43ea0a416 100644
--- a/media-video/chaplin/chaplin-1.10-r1.ebuild
+++ b/media-video/chaplin/chaplin-1.10-r1.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/chaplin/chaplin-1.10-r1.ebuild,v 1.1 2006/08/21 17:58:56 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/chaplin/chaplin-1.10-r1.ebuild,v 1.2 2006/08/30 13:41:34 zzam Exp $
+
+inherit eutils
 
 IUSE="transcode vcd"
 
-MY_S="${WORKDIR}/chaplin"
+S="${WORKDIR}/${PN}"
 
 DESCRIPTION="This is a program to raw copy chapters from a dvd using libdvdread"
 HOMEPAGE="http://www.lallafa.de/bp/chaplin.html"
@@ -19,12 +21,12 @@ DEPEND=">=media-libs/libdvdread-0.9.4
 	transcode? ( >=media-video/transcode-0.6.2 )
 	vcd? ( >=media-video/vcdimager-0.7.2 )"
 
-src_compile() {
-	cd ${MY_S} || die
-	emake || die
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${P}-libdvdread-0.9.6.patch"
 }
 
 src_install() {
-	dobin ${MY_S}/chaplin || die
-	dobin ${MY_S}/chaplin-genmenu || die
+	dobin chaplin || die "Failed installing file chaplin"
+	dobin chaplin-genmenu || die "Failed installing file chaplin-genmenu"
 }
diff --git a/media-video/chaplin/files/chaplin-1.10-libdvdread-0.9.6.patch b/media-video/chaplin/files/chaplin-1.10-libdvdread-0.9.6.patch
new file mode 100644
index 000000000000..7e68dd67a692
--- /dev/null
+++ b/media-video/chaplin/files/chaplin-1.10-libdvdread-0.9.6.patch
@@ -0,0 +1,11 @@
+diff -N -u -r chaplin/chaplin.c chaplin-new/chaplin.c
+--- chaplin/chaplin.c	2004-03-21 18:45:44.000000000 +0100
++++ chaplin-new/chaplin.c	2006-06-29 22:36:54.457745979 +0200
+@@ -18,6 +18,7 @@
+ #include <ctype.h>
+ #include <string.h>
+ #include <math.h>
++#include <inttypes.h>
+ 
+ /* libdvdread stuff */
+ #include <dvdread/dvd_reader.h>