made a better XDG patch

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 97 insertions, 2 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/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>