Mirror tarballs since SF project is dead; Error in calculation of chapter length patch, bug 222637

Package-Manager: portage-2.1.5.3

7 files changed, 80 insertions, 13 deletions

diff --git a/media-video/lsdvd/ChangeLog b/media-video/lsdvd/ChangeLog
index 15ebe2e4ff76..87f0cde499bc 100644
--- a/media-video/lsdvd/ChangeLog
+++ b/media-video/lsdvd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/lsdvd
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lsdvd/ChangeLog,v 1.36 2008/01/02 14:04:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lsdvd/ChangeLog,v 1.37 2008/06/10 14:06:57 beandog Exp $
+
+*lsdvd-0.16-r1 (10 Jun 2008)
+
+  10 Jun 2008; Steve Dibb <beandog@gentoo.org> +files/lsdvd-0.16-usec.patch,
+  lsdvd-0.10.ebuild, lsdvd-0.15.ebuild, lsdvd-0.16.ebuild,
+  +lsdvd-0.16-r1.ebuild:
+  Mirror tarballs since SF project is dead; Error in calculation of chapter
+  length patch, bug 222637
 
   02 Jan 2008; Raúl Porcel <armin76@gentoo.org> lsdvd-0.16.ebuild:
   Re-add ~ia64
diff --git a/media-video/lsdvd/Manifest b/media-video/lsdvd/Manifest
index 63f96d6e78bd..4926d8213398 100644
--- a/media-video/lsdvd/Manifest
+++ b/media-video/lsdvd/Manifest
@@ -1,10 +1,12 @@
 AUX lsdvd-0.15-types.patch 962 RMD160 2b784f089d66769aa76275362346a9988ca30041 SHA1 b40c6e80741890182b99e99231c53e074c939926 SHA256 2226aa17b95852426c7bf03175d8608b1556064948a487fe3b82db7913e5bbd0
 AUX lsdvd-0.16-types.patch 971 RMD160 02c31c4780a2b533d11e27add4bbc8de13582547 SHA1 ef34c72ae0e4f7b43ecb51d84a65a545aa0ed719 SHA256 2b187779b57aa5194963eff3e13da573f735cb70a0160bfe6cab9fff6bef9fa8
+AUX lsdvd-0.16-usec.patch 973 RMD160 b72c614147be704fde1c98dc3a70005c70a3a3a8 SHA1 fb1581b482eb87b69d48e92bd72b2fcb17299acf SHA256 f83938b1ebfdfcb1b2503352d24e1c04bfb2a4e603a418a94d2069a0da926759
 DIST lsdvd-0.10.tar.gz 36206 RMD160 a3c718dba1f6556a8e03d66f453483f3e50f2027 SHA1 910bab96300dade7b07baa7cb2037ef473c035d6 SHA256 79ce57dc82e66585550f1a8618b3ea03a8e45f6351b599dbd6e4efafdbfc4d59
 DIST lsdvd-0.15.tar.gz 40101 RMD160 af984f25ee2d4f1b2d61b32836d1b8ceabdaf418 SHA1 c83de22c98a9d387d648fd89aada4de9b65f2925 SHA256 e98eee0386000dd2e5ef59d5ff3aa55c611e299924b0d6ad304b67e6f58074d5
 DIST lsdvd-0.16.tar.gz 100495 RMD160 fcd0993aea6ad2203c8be019ec31ba7c8660ca25 SHA1 d5c0d32bfb220807ebdc0bfbb17679e7294791f4 SHA256 04ae3e2d823ed427e31d57f3677d28ec36bdf3bf984d35f7bdfab030d89b20f1
-EBUILD lsdvd-0.10.ebuild 568 RMD160 b220977380856d2400aba9a7caf46e3f81e2f636 SHA1 f7e1183ed6714bc4db5ad18ab01043257b336773 SHA256 53e0824e8d3d2163b1c7dd43cd9b1f5c766f457eb40ab8de34dbe57b43df6a11
-EBUILD lsdvd-0.15.ebuild 746 RMD160 ccac84b7d01d6f6414ac74c73e550344da3f9468 SHA1 fa77472a99677bcd012bd5ebff32a6585990429a SHA256 322a5f950f833c2971e300761bf533d8baaf8504d5cf9fc23c7f34b0ac71ff1d
-EBUILD lsdvd-0.16.ebuild 753 RMD160 be6832063b70ccc30ea83fee8f4123f75f7b07fa SHA1 d29111b52a2157f404b6b6a0809f83c71399172f SHA256 e4b303ed6863529fcbfd89252dbcb5c464915eb330c3cb80d1d9e6feaa45b5f2
-MISC ChangeLog 4333 RMD160 23ba1938d9f909f505a9a4a8616646060b842fb3 SHA1 d2c2af67b3637589b27744bfb54a0078f51f8aee SHA256 24f091ee31edcec4e7475a28a017b7cafc43ab5d2d5b87f81adfe0ea8cda2db9
+EBUILD lsdvd-0.10.ebuild 555 RMD160 42049eb9aae7826827c05cc698094fa0aa0f16a9 SHA1 35686ba09dcd99b27e08d3d24c9e52ce280a09bb SHA256 39874d221ad4426c893ed32b5f07469ff1b7863d5dde4ac9e3480cc39c4ad947
+EBUILD lsdvd-0.15.ebuild 734 RMD160 b6f8ceb7c075a22f67f4fec517b9a4d704d87b93 SHA1 02aaf751e1892722440738816a973c996bfd32dc SHA256 e7520bc085b731aa79e58d30e691ab2a70208cb6dd9109dd58dccd74a07de9ed
+EBUILD lsdvd-0.16-r1.ebuild 803 RMD160 48ab2ec0f8be09e8b2f54f6cf725ac328d0e80a6 SHA1 4357224638305aa40a6bac490e11f4d58e0b1546 SHA256 c65242a56981238a57c392bcca0305fa741b80105e9e9bc8f567442e2406be23
+EBUILD lsdvd-0.16.ebuild 742 RMD160 8a3bd3ac38248437be58a929a840af5246eaa9f9 SHA1 b9f1018343da4a7384c97bd287036953297488f5 SHA256 ec5e427370b6c5c8571443c916dfeb7b6a6bbdb160a6fe939952b06c03e08b53
+MISC ChangeLog 4628 RMD160 34758d82162430852f18a0128fa00019ee2adce5 SHA1 0bcbac8084e50cd4d5fa8b4a35ea4a83ac40ca73 SHA256 1df780b78d4accc8b74250423e1b14c81ab016d9867ace43dbff1f5a5b7006a7
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
diff --git a/media-video/lsdvd/files/lsdvd-0.16-usec.patch b/media-video/lsdvd/files/lsdvd-0.16-usec.patch
new file mode 100644
index 000000000000..bfaa16e9615d
--- /dev/null
+++ b/media-video/lsdvd/files/lsdvd-0.16-usec.patch
@@ -0,0 +1,21 @@
+diff -uw lsdvd-0.16.orig/lsdvd.c lsdvd-0.16/lsdvd.c
+--- lsdvd-0.16.orig/lsdvd.c	2006-03-02 14:48:11.000000000 +0100
++++ lsdvd-0.16/lsdvd.c	2008-05-18 13:58:15.000000000 +0200
+@@ -92,7 +92,7 @@
+ 	ms += (((dt->second & 0xf0) >> 3) * 5 + (dt->second & 0x0f)) * 1000;
+ 
+ 	if(fps > 0)
+-	ms += ((dt->frame_u & 0x30) >> 3) * 5 + (dt->frame_u & 0x0f) * 1000.0 / fps;
++	ms += (((dt->frame_u & 0x30) >> 3) * 5 + (dt->frame_u & 0x0f)) * 1000.0 / fps;
+ 
+ 	return ms;
+ }
+@@ -107,7 +107,7 @@
+ {
+ 	double fps = frames_per_s[(dt->frame_u & 0xc0) >> 6];
+ 
+-	pt->usec = pt->usec + ((dt->frame_u & 0x30) >> 3) * 5 + (dt->frame_u & 0x0f) * 1000.0 / fps;
++	pt->usec = pt->usec + (((dt->frame_u & 0x30) >> 3) * 5 + (dt->frame_u & 0x0f)) * 1000.0 / fps;
+ 	pt->second = pt->second + ((dt->second & 0xf0) >> 3) * 5 + (dt->second & 0x0f);
+ 	pt->minute = pt->minute + ((dt->minute & 0xf0) >> 3) * 5 + (dt->minute & 0x0f);
+ 	pt->hour = pt->hour + ((dt->hour &   0xf0) >> 3) * 5 + (dt->hour   & 0x0f);
diff --git a/media-video/lsdvd/lsdvd-0.10.ebuild b/media-video/lsdvd/lsdvd-0.10.ebuild
index 53e6ec05dd40..9e41936af5f0 100644
--- a/media-video/lsdvd/lsdvd-0.10.ebuild
+++ b/media-video/lsdvd/lsdvd-0.10.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lsdvd/lsdvd-0.10.ebuild,v 1.10 2006/04/01 11:59:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lsdvd/lsdvd-0.10.ebuild,v 1.11 2008/06/10 14:06:57 beandog Exp $
 
 DESCRIPTION="Utility for getting info out of DVDs"
 HOMEPAGE="http://untrepid.com/lsdvd/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-video/lsdvd/lsdvd-0.15.ebuild b/media-video/lsdvd/lsdvd-0.15.ebuild
index e82cbcd25c39..864611be00e5 100644
--- a/media-video/lsdvd/lsdvd-0.15.ebuild
+++ b/media-video/lsdvd/lsdvd-0.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lsdvd/lsdvd-0.15.ebuild,v 1.13 2006/10/29 22:55:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lsdvd/lsdvd-0.15.ebuild,v 1.14 2008/06/10 14:06:57 beandog Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -9,7 +9,7 @@ inherit eutils autotools
 
 DESCRIPTION="Utility for getting info out of DVDs"
 HOMEPAGE="http://untrepid.com/lsdvd/"
-SRC_URI="mirror://sourceforge/${P}/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-video/lsdvd/lsdvd-0.16-r1.ebuild b/media-video/lsdvd/lsdvd-0.16-r1.ebuild
new file mode 100644
index 000000000000..f69400b78f4f
--- /dev/null
+++ b/media-video/lsdvd/lsdvd-0.16-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/lsdvd/lsdvd-0.16-r1.ebuild,v 1.1 2008/06/10 14:06:57 beandog Exp $
+
+WANT_AUTOMAKE="latest"
+WANT_AUTOCONF="latest"
+
+inherit eutils autotools
+
+DESCRIPTION="Utility for getting info out of DVDs"
+HOMEPAGE="http://untrepid.com/lsdvd/"
+SRC_URI="mirror://gentoo/lsdvd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="media-libs/libdvdread"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-types.patch"
+
+	# bug 222637
+	epatch "${FILESDIR}/${P}-usec.patch"
+
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS NEWS README
+}
diff --git a/media-video/lsdvd/lsdvd-0.16.ebuild b/media-video/lsdvd/lsdvd-0.16.ebuild
index 2e6b2f0c915a..a74e74bdbc9a 100644
--- a/media-video/lsdvd/lsdvd-0.16.ebuild
+++ b/media-video/lsdvd/lsdvd-0.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lsdvd/lsdvd-0.16.ebuild,v 1.10 2008/01/02 14:04:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lsdvd/lsdvd-0.16.ebuild,v 1.11 2008/06/10 14:06:57 beandog Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -9,7 +9,7 @@ inherit eutils autotools
 
 DESCRIPTION="Utility for getting info out of DVDs"
 HOMEPAGE="http://untrepid.com/lsdvd/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"