Readded the allthemes SRC_URI, due to Bernd Pachur <valirion@thybaria.de>, Bug #151958.

Package-Manager: portage-2.1.2_pre3-r5

4 files changed, 29 insertions, 21 deletions

diff --git a/media-tv/tvbrowser/ChangeLog b/media-tv/tvbrowser/ChangeLog
index 3c332ec48882..187fb63ae48a 100644
--- a/media-tv/tvbrowser/ChangeLog
+++ b/media-tv/tvbrowser/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/tvbrowser
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.4 2006/10/18 18:16:53 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.5 2006/10/20 10:40:59 zzam Exp $
+
+  20 Oct 2006; Matthias Schwarzott <zzam@gentoo.org> tvbrowser-2.2.1.ebuild:
+  Readded the allthemes SRC_URI, due to Bernd Pachur <valirion@thybaria.de>,
+  Bug #151958.
 
 *tvbrowser-2.2.1 (18 Oct 2006)
 
diff --git a/media-tv/tvbrowser/Manifest b/media-tv/tvbrowser/Manifest
index 05a749b2d429..11bea37f2766 100644
--- a/media-tv/tvbrowser/Manifest
+++ b/media-tv/tvbrowser/Manifest
@@ -16,14 +16,14 @@ EBUILD tvbrowser-2.1.ebuild 3034 RMD160 8febfecec8a622ecd713a7c075b4ab9d6e34d6a4
 MD5 4cb7f65fad55ef92aa8879380e0b84ca tvbrowser-2.1.ebuild 3034
 RMD160 8febfecec8a622ecd713a7c075b4ab9d6e34d6a4 tvbrowser-2.1.ebuild 3034
 SHA256 422efa61999578addd34056126db2deee696b1023eb73568a9a6f125a599c1d9 tvbrowser-2.1.ebuild 3034
-EBUILD tvbrowser-2.2.1.ebuild 2945 RMD160 5a59c04919c2cd3929b2ea398c67e8a049462c10 SHA1 41b7162aa6443695c6f5a3122d88a8f0baf0c2ba SHA256 a0c1899b4d4e6b8afce50e7eec0f90af27b7acece75efeb841a017f346e7455b
-MD5 65f4e911f71eeb71af08991dfd38abf3 tvbrowser-2.2.1.ebuild 2945
-RMD160 5a59c04919c2cd3929b2ea398c67e8a049462c10 tvbrowser-2.2.1.ebuild 2945
-SHA256 a0c1899b4d4e6b8afce50e7eec0f90af27b7acece75efeb841a017f346e7455b tvbrowser-2.2.1.ebuild 2945
-MISC ChangeLog 1253 RMD160 27b45d2335479e4585fa90715c4512c259fb43a7 SHA1 0dc89e9aa77dc4990dcaaecf30faa08f59024180 SHA256 6a686a7573234f9bbdd4aa39ab8219e5917d91fd699cef2e311c3498536b0a42
-MD5 d7527527a3b6387b21b1dc2b1b046fa1 ChangeLog 1253
-RMD160 27b45d2335479e4585fa90715c4512c259fb43a7 ChangeLog 1253
-SHA256 6a686a7573234f9bbdd4aa39ab8219e5917d91fd699cef2e311c3498536b0a42 ChangeLog 1253
+EBUILD tvbrowser-2.2.1.ebuild 2996 RMD160 168a5868d45da2395b55d7871dd717fe7d3340b2 SHA1 fa0435edf69dee000b0738930c96a67d414c06e4 SHA256 f2880d275578706a4a8318c86e222a29d9b9b7a9b15daa8810bfcc7af7ca4208
+MD5 981bd0a253b7a8147813c9a1051fee3e tvbrowser-2.2.1.ebuild 2996
+RMD160 168a5868d45da2395b55d7871dd717fe7d3340b2 tvbrowser-2.2.1.ebuild 2996
+SHA256 f2880d275578706a4a8318c86e222a29d9b9b7a9b15daa8810bfcc7af7ca4208 tvbrowser-2.2.1.ebuild 2996
+MISC ChangeLog 1423 RMD160 8e051c404b85f566d52d745322b94712ed54b15b SHA1 6077a7e05a3b3dffbace830adb3ab9b8cebfa65f SHA256 35efc6c2584af0941667c1e67eb8d41c422901766ba8b89b126715c830a1e26e
+MD5 6810089d976cc8fbf1fb3f5197a7131a ChangeLog 1423
+RMD160 8e051c404b85f566d52d745322b94712ed54b15b ChangeLog 1423
+SHA256 35efc6c2584af0941667c1e67eb8d41c422901766ba8b89b126715c830a1e26e ChangeLog 1423
 MISC metadata.xml 300 RMD160 c85719cef743cf573efe73f8f84564292085c91c SHA1 4c00933e1ed60039fae091034d83e28d0890e87c SHA256 29feafd8b7177b65f8bd92553ac96779d9a91e3b7b4eeecfb0924eb7b6979587
 MD5 7c30ab7528b676a1a0c2737821599b29 metadata.xml 300
 RMD160 c85719cef743cf573efe73f8f84564292085c91c metadata.xml 300
@@ -31,13 +31,13 @@ SHA256 29feafd8b7177b65f8bd92553ac96779d9a91e3b7b4eeecfb0924eb7b6979587 metadata
 MD5 157ff2d8ae57cb817f9796cc69b0c45c files/digest-tvbrowser-2.1 479
 RMD160 bd0ebbd0e74cb39ef73fc8fdb291bdce60463fee files/digest-tvbrowser-2.1 479
 SHA256 a1a1bacee8dd965eb5c6ff448ffe2025a176f449b1728eefa2d4fdf3e8fc00c7 files/digest-tvbrowser-2.1 479
-MD5 fc76bbcd6ccae47dfdbaf89edb15cf6a files/digest-tvbrowser-2.2.1 253
-RMD160 b9e41db0784cba92c1d2c0add1683115b3acbf7e files/digest-tvbrowser-2.2.1 253
-SHA256 095cfdcfc2c4b313ac66f3f90b9ef6776951e25561d4f079f94cffb9f0e90b17 files/digest-tvbrowser-2.2.1 253
+MD5 0bd8ad654d1ad19db531a20b1311d646 files/digest-tvbrowser-2.2.1 485
+RMD160 f6c21121b11508d27a957b89d4f1b642b9cdffdb files/digest-tvbrowser-2.2.1 485
+SHA256 fc70e99e069aedc9fb22663048ea97fa19354b6ca710828474511266faad8ab5 files/digest-tvbrowser-2.2.1 485
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFNm+kt2vP6XvVdOcRAvp7AJ92RnQAIVqe92C8+CbR/RrbvFFROQCgpH5+
-/n8BVQqsIv4j/xJFrPwBG/Q=
-=T18l
+iD8DBQFFOKfLt2vP6XvVdOcRAvtSAJ9xggELkGvBdT+eug+wa84vZxrbfgCff+tg
+On+KULp2VX8CMFjctJvsfek=
+=zGbr
 -----END PGP SIGNATURE-----
diff --git a/media-tv/tvbrowser/files/digest-tvbrowser-2.2.1 b/media-tv/tvbrowser/files/digest-tvbrowser-2.2.1
index a9d128bee411..e5c5696b2fcb 100644
--- a/media-tv/tvbrowser/files/digest-tvbrowser-2.2.1
+++ b/media-tv/tvbrowser/files/digest-tvbrowser-2.2.1
@@ -1,3 +1,6 @@
+MD5 672a2f53c54511ced3f796c65a9183f7 allthemepacks.zip 210954
+RMD160 6d456534bd504c98eb57ff39876ee2c2ffabee70 allthemepacks.zip 210954
+SHA256 602d229f734c2fa3e2984a2d86faf6c1825d6db56329b00ce25ba1a2eb5b64b7 allthemepacks.zip 210954
 MD5 2016dd8ab726494b4f8ad215fd4f8569 tvbrowser-2.2.1-src.zip 8138920
 RMD160 e0080a207026ea0d3037e97032fe0451bb973302 tvbrowser-2.2.1-src.zip 8138920
 SHA256 bb4217743331f475a666e74ea9f307755f890213514e1c817d5d825a90240499 tvbrowser-2.2.1-src.zip 8138920
diff --git a/media-tv/tvbrowser/tvbrowser-2.2.1.ebuild b/media-tv/tvbrowser/tvbrowser-2.2.1.ebuild
index 17a78f349543..3d1919e4cc98 100644
--- a/media-tv/tvbrowser/tvbrowser-2.2.1.ebuild
+++ b/media-tv/tvbrowser/tvbrowser-2.2.1.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-2.2.1.ebuild,v 1.1 2006/10/18 18:16:53 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-2.2.1.ebuild,v 1.2 2006/10/20 10:40:59 zzam Exp $
 
 inherit eutils java-pkg-2 java-ant-2 autotools flag-o-matic
 
 DESCRIPTION="Themeable and easy to use TV Guide - written in Java"
 HOMEPAGE="http://www.tvbrowser.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip
+themes? ( http://www.tvbrowser.org/downloads/themepacks/allthemepacks.zip )"
 
 SLOT="0"
 KEYWORDS="~x86"
@@ -42,7 +43,7 @@ LICENSE="GPL-2"
 IUSE="doc jikes themes source"
 
 src_unpack() {
-	unpack ${A}
+	unpack ${P}-src.zip
 
 	epatch ${FILESDIR}/${P}-makefiles.patch
 
@@ -113,11 +114,11 @@ src_install() {
 	cp -a plugins ${D}/${todir}
 	cp linux.properties ${D}/${todir}
 
-	mkdir "${D}/usr/share/${PN}-themepacks"
-	cp themepacks/themepack.zip "${D}/usr/share/${PN}-themepacks"
+	insinto "/usr/share/${PN}/themepacks"
+	doins themepacks/themepack.zip
 
 	if use themes; then
-		cd "${D}/usr/share/${PN}-themepacks"
+		cd "${D}/usr/share/${PN}/themepacks"
 		unpack allthemepacks.zip
 	fi