made a better XDG patch

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 102 insertions, 4 deletions

diff --git a/media-video/bdsup2sub/ChangeLog b/media-video/bdsup2sub/ChangeLog
index 79a4c5403b07..eba791a1def1 100644
--- a/media-video/bdsup2sub/ChangeLog
+++ b/media-video/bdsup2sub/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/bdsup2sub
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/bdsup2sub/ChangeLog,v 1.2 2010/07/29 11:14:40 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/bdsup2sub/ChangeLog,v 1.3 2010/08/01 00:45:48 sbriesen Exp $
+
+*bdsup2sub-4.0.0-r1 (01 Aug 2010)
+
+  01 Aug 2010; Stefan Briesenick <sbriesen@gentoo.org>
+  +bdsup2sub-4.0.0-r1.ebuild, +files/bdsup2sub-4.0.0-xdg.patch,
+  metadata.xml:
+  made a better XDG patch
 
   29 Jul 2010; Stefan Briesenick <sbriesen@gentoo.org>
   bdsup2sub-4.0.0.ebuild:
diff --git a/media-video/bdsup2sub/Manifest b/media-video/bdsup2sub/Manifest
index 983bb0a5bef2..cac28ff96d1f 100644
--- a/media-video/bdsup2sub/Manifest
+++ b/media-video/bdsup2sub/Manifest
@@ -1,6 +1,9 @@
 AUX bdsup2sub-4.0.0-xdg.diff 1068 RMD160 d8dffb47502acd61dd3caa63b5ca12d22490a210 SHA1 7bcf23beaf0e77039f0792d468318dcc7ad7941b SHA256 6f2fcf0968ba800eb14f5247f8845a304eaa54bb4147bb9d872688fbcf99f720
+AUX bdsup2sub-4.0.0-xdg.patch 1032 RMD160 38165c7afef03fac63b96aa95746e256525c25c3 SHA1 7d1d334848f904ca9e86b50738549c721903c95e SHA256 52a38052c92b131edac2a6c7a346bc19381f06ccc28aa4104655a8598ca1ed67
 AUX build-4.0.0.xml 1836 RMD160 c3a2cab5ef0dca3e7c49ed845d2370d7535579b6 SHA1 293bbba2f79a169563bb07088ef3a303209f7506 SHA256 63dc1fa4234893f8155668dfb08ce72ad0160143a787d196f4b28999992a5e86
 DIST bdsup2sub-4.0.0.tar.xz 199796 RMD160 f88254ed673df09232a41f5edea0f7ebc501a9b0 SHA1 32a6f14c98671c1c1bbe5c4c46f5c5499424a5df SHA256 72d06f013ab13a89e213ada48e0b43dc8abee87e8eb16ba2d07b5d1a96f69569
+DIST xdg-20100731.java.xz 648 RMD160 937ce2b225e682662e9cea44b0554d83d5372cb2 SHA1 9493062969d21c06c710b71146dc530b35f23c7b SHA256 b6a189323fcc25ae5bebc006d870b4191a3bec34c80de7e337e5ed8a39f332c6
+EBUILD bdsup2sub-4.0.0-r1.ebuild 1246 RMD160 94e51d6edb60a004aee2d4180df455040fe9f0ae SHA1 05ac01094d4e6c726d57f6354795ff92e67de900 SHA256 2ae29bfa39cc8ace97e621c105979a9d9400aca5a177cbec1bf96466b1ddfa92
 EBUILD bdsup2sub-4.0.0.ebuild 1122 RMD160 d853905fd399f4daae135dec0a22ae7c39b504fa SHA1 d7d788b1e2d77ace97b7b2df16e73115ade326f0 SHA256 6457bf24900afc2e01907352e4147756cdc6cd0c6206a8ad06eb1580b820a366
-MISC ChangeLog 536 RMD160 007f6f4a5140dc2c462a5ccf396fde6a699ccd69 SHA1 75e90339649ccac4d727b9ac41b5b74878df198b SHA256 4ec02c40eb00c7e69227e89a11f72e0d6269269b761b1a2ee8edaf96d24745ed
-MISC metadata.xml 382 RMD160 eb2e7e1115347b1228f1c028dfd80ae336ce2d4d SHA1 c82cc68f511b47c070f68474bca5ddcecfa47be2 SHA256 7b3a54f88030a65ef3706ba1b51caa45bca0c9bfdd5273d066ad765b0aabc025
+MISC ChangeLog 733 RMD160 64075446bfa911a22d197bd9c32f4da6a3666e5c SHA1 ca546945656a7adddce0ad9d6f06fbe6557288c3 SHA256 11df9200914c13b8c4230ece0a65ece39fc410aee8b265388b568c1c4ce48b11
+MISC metadata.xml 380 RMD160 33881c277765e53f7bc30991d834e3d6256ee2ba SHA1 153ac8f05e347b518d8dc563760e327307ee9437 SHA256 c4deeea501838c4f5e6ef5516fa217b1f898665d58302fad6da70000af967b68
diff --git a/media-video/bdsup2sub/bdsup2sub-4.0.0-r1.ebuild b/media-video/bdsup2sub/bdsup2sub-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..01ebd2a5d49c
--- /dev/null
+++ b/media-video/bdsup2sub/bdsup2sub-4.0.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/bdsup2sub/bdsup2sub-4.0.0-r1.ebuild,v 1.1 2010/08/01 00:45:48 sbriesen Exp $
+
+EAPI="3"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+XDG_P="xdg-20100731"
+
+DESCRIPTION="A tool to convert and tweak bitmap based subtitle streams"
+HOMEPAGE="http://bdsup2sub.javaforge.com/help.htm"
+SRC_URI="http://sbriesen.de/gentoo/distfiles/${P}.tar.xz
+	http://sbriesen.de/gentoo/distfiles/${XDG_P}.java.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S="${WORKDIR}/${PN}/${PV}"
+
+java_prepare() {
+	# apply XDG patch
+	cp -f "${WORKDIR}/${XDG_P}.java" "${S}/src/xdg.java"
+	epatch "${FILESDIR}/${P}-xdg.patch"
+
+	# copy build.xml
+	cp -f "${FILESDIR}/build-${PV}.xml" build.xml || die
+}
+
+src_compile() {
+	eant build $(use_doc)
+}
+
+src_install() {
+	java-pkg_dojar dist/BDSup2Sub.jar
+	java-pkg_dolauncher BDSup2Sub --main BDSup2Sub --java_args -Xmx256m
+	newicon bin_copy/icon_32.png BDSup2Sub.png
+	make_desktop_entry BDSup2Sub BDSup2Sub BDSup2Sub
+	use doc && java-pkg_dojavadoc apidocs
+	use source && java-pkg_dosrc src
+}
diff --git a/media-video/bdsup2sub/files/bdsup2sub-4.0.0-xdg.patch b/media-video/bdsup2sub/files/bdsup2sub-4.0.0-xdg.patch
new file mode 100644
index 000000000000..a590ae983201
--- /dev/null
+++ b/media-video/bdsup2sub/files/bdsup2sub-4.0.0-xdg.patch
@@ -0,0 +1,40 @@
+--- src/deadbeef/SupTools/Core.java	2010-07-29 13:01:48.000000000 +0200
++++ src/deadbeef/SupTools/Core.java	2010-08-01 02:19:25.215473885 +0200
+@@ -22,6 +22,8 @@
+ import deadbeef.Tools.Props;

+ import deadbeef.Tools.ToolBox;

+ 

++import xdg.*;

++

+ /*

+  * Copyright 2009 Volker Oth (0xdeadbeef)

+  *

+@@ -750,6 +752,7 @@
+ 			cliMode = false;

+ 			String s = c.getClass().getName().replace('.','/') + ".class";

+ 			URL url = c.getClass().getClassLoader().getResource(s);

++			/*

+ 			int pos;

+ 			try {

+ 				fnameProps = URLDecoder.decode(url.getPath(),"UTF-8");

+@@ -767,6 +770,8 @@
+ 					fnameProps = fnameProps.substring(0,pos+1);

+ 			}

+ 			fnameProps += Core.iniName;

++			*/

++			fnameProps = xdg.config_home() + "/" + Core.iniName;

+ 

+ 			// read properties from ini file

+ 			props = new Props();

+@@ -905,8 +910,10 @@
+ 	 * Write properties

+ 	 */

+ 	public static void storeProps() {

+-		if (props != null)

++		if (props != null) {

++			xdg.mkdirs_file(fnameProps);

+ 			props.save(fnameProps);

++		}

+ 	}

+ 	

+ 	/**

diff --git a/media-video/bdsup2sub/metadata.xml b/media-video/bdsup2sub/metadata.xml
index 5edc8a67c7e4..e9ddbb70caae 100644
--- a/media-video/bdsup2sub/metadata.xml
+++ b/media-video/bdsup2sub/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
+	<herd>video</herd>
 	<maintainer>
 		<email>sbriesen@gentoo.org</email>
 		<name>Stefan Briesenick</name>