Version bump to 1.3.7.

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

4 files changed, 138 insertions, 3 deletions

diff --git a/app-cdr/isomaster/ChangeLog b/app-cdr/isomaster/ChangeLog
index 0ad632a38775..fb5ef82030c3 100644
--- a/app-cdr/isomaster/ChangeLog
+++ b/app-cdr/isomaster/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/isomaster
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/isomaster/ChangeLog,v 1.14 2009/06/20 13:04:57 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/isomaster/ChangeLog,v 1.15 2010/01/09 14:41:59 idl0r Exp $
+
+*isomaster-1.3.7 (09 Jan 2010)
+
+  09 Jan 2010; Christian Ruppert <idl0r@gentoo.org> +isomaster-1.3.7.ebuild,
+  +files/isomaster-1.3.7-noiniparser.patch:
+  Version bump to 1.3.7.
 
   20 Jun 2009; Samuli Suominen <ssuominen@gentoo.org>
   isomaster-1.3.5.ebuild:
diff --git a/app-cdr/isomaster/Manifest b/app-cdr/isomaster/Manifest
index bab755b818f2..5702255b806a 100644
--- a/app-cdr/isomaster/Manifest
+++ b/app-cdr/isomaster/Manifest
@@ -1,5 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX isomaster-1.3.5-ldflags.diff 543 RMD160 5aa66133975b3cf20f7de71f126ca4aea300fae9 SHA1 a7450a8afb96b9bcef7aa1422b49bf126d769cab SHA256 783c31804f54faa234c33d0dc86fc71946151db075ccc452866fe15482dd6161
+AUX isomaster-1.3.7-noiniparser.patch 2459 RMD160 82377c449de27e5bc8cbcddd98eeafe470d2963d SHA1 46ee742bc2594558118203ddcf61c80b2327930b SHA256 ab7fd1854d0fecc7a48545eaefcfedfaa5039fae53839030f8ba1a45c09e9b6d
 DIST isomaster-1.3.5.tar.bz2 196042 RMD160 813c729b5308e725cbcfea688de343260bae63c5 SHA1 76adcae894a169365e43eaac30f4a7c3926fa78c SHA256 27b9b53d5e361b56a6e302131af2dc97f7135f74786637e6244e075606226597
+DIST isomaster-1.3.7.tar.bz2 211673 RMD160 9efdd239c82072510fca2630120bd302b89a8d1c SHA1 b3fb70a0e71c6f8aafb42c7f26367966ea269bcc SHA256 258b1ce0a9da35dc172c7d44866056c6873bd2992984af1e84deb25f4a7b47f7
 EBUILD isomaster-1.3.5.ebuild 881 RMD160 2532408437e6172688b208e74b177afb1d9df990 SHA1 e4acd2dce48c14987cc790154f22fb1034b7d089 SHA256 5bb0dfcb18a2d69969413616f0d92792e01d6eb8a46473f83d1f777a247489fb
-MISC ChangeLog 2365 RMD160 07c74f4ae784012bd3a9e5a8edaacd69602a59a7 SHA1 fe27959ff68d4e26ad582832acdfa44d422b1e66 SHA256 fed00c55bcf40e6bf5e02d4d0c467f3dc64f0cbb49dbfe9dd98c5b2216d35693
+EBUILD isomaster-1.3.7.ebuild 1028 RMD160 4b4148684ecfc2a79bc721cbf0bb93036e2be0ad SHA1 0e4322e74652450ccd5a063b7414f91b86b52b7e SHA256 56cef1543aac59e1bed77560cc16985abce229c5cb007d2027c06814a9ef0b6e
+MISC ChangeLog 2540 RMD160 a1bae37fda859f004ef4ce5dd18a9b86fb44731f SHA1 1e7326ae4da882f853cc55fc43b83e004003a344 SHA256 299ce41249c286eb75f0bd00157151e8df5c0e01a1d1f4b0a09b3b4d7ccf299a
 MISC metadata.xml 166 RMD160 02ca0a5d9279c1b52c3887f5a1f52f3feb002af9 SHA1 b9fccc7c24aa717c30efef068fd544a692f264f6 SHA256 ce62d1e5b04e01d03a732ee6d33b3d500810de8e55af4a527c970e5b475735d8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAktIlccACgkQixe2jn+ufTgWTgCdHP552GFIzl30OkCjuA3j5SsR
+Jb0An3m9iBGfPggFhTi2/TFKINjaWfd/
+=aYFj
+-----END PGP SIGNATURE-----
diff --git a/app-cdr/isomaster/files/isomaster-1.3.7-noiniparser.patch b/app-cdr/isomaster/files/isomaster-1.3.7-noiniparser.patch
new file mode 100644
index 000000000000..9ee607b2e43b
--- /dev/null
+++ b/app-cdr/isomaster/files/isomaster-1.3.7-noiniparser.patch
@@ -0,0 +1,69 @@
+diff -Naurp -p isomaster-1.3.7.orig/Makefile isomaster-1.3.7/Makefile
+--- isomaster-1.3.7.orig/Makefile	2010-01-09 14:18:00.333993253 +0100
++++ isomaster-1.3.7/Makefile	2010-01-09 15:17:31.047246400 +0100
+@@ -65,21 +65,18 @@ OBJECTS = isomaster.o window.o browser.o
+ 
+ all: translations isomaster.desktop isomaster
+ 
+-isomaster: $(OBJECTS) lib iniparser
++isomaster: $(OBJECTS) lib
+ 	@echo 'Linking isomaster'
+-	@$(CC) $(OBJECTS) bk/bk.a iniparser-2.17/libiniparser.a $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) `pkg-config --libs gtk+-2.0` -o isomaster
++	@$(CC) $(LDFLAGS) $(OBJECTS) bk/bk.a `pkg-config --libs gtk+-2.0` -liniparser -o isomaster
+ 
+ # static pattern rule
+ $(OBJECTS): %.o: %.c %.h bk/bk.h Makefile
+ 	@echo 'Compiling' $<
+-	@$(CC) $< $(CFLAGS) $(CPPFLAGS) -c -o $@
++	@$(CC) $(CFLAGS) $(CPPFLAGS) $< -c -o $@
+ 
+ lib:
+ 	cd bk && $(MAKE)
+ 
+-iniparser:
+-	cd iniparser-2.17 && $(MAKE)
+-
+ translations:
+ ifndef WITHOUT_NLS
+ 	cd po && $(MAKE)
+@@ -94,7 +91,6 @@ bk-doc:
+ 
+ clean: 
+ 	cd bk && $(MAKE) clean
+-	cd iniparser-2.17 && $(MAKE) clean
+ ifndef WITHOUT_NLS
+ 	cd po && $(MAKE) clean
+ endif
+diff -Naurp -p isomaster-1.3.7.orig/settings.c isomaster-1.3.7/settings.c
+--- isomaster-1.3.7.orig/settings.c	2010-01-09 14:18:00.329993692 +0100
++++ isomaster-1.3.7/settings.c	2010-01-09 15:19:29.052995022 +0100
+@@ -607,7 +607,7 @@ void loadSettings(void)
+         GBLappSettings.recentlyOpen[i] = NULL;
+         if(GBLsettingsDictionary != NULL)
+         {
+-            char configNameStr[20] = "ui:recentlyopen";
++            char configNameStr[46] = "ui:recentlyopen";
+             snprintf(configNameStr + 15, 20, "%d", i);
+             
+             tempStr = iniparser_getstring(GBLsettingsDictionary, 
+@@ -892,7 +892,7 @@ void writeSettings(void)
+     
+     for(int i = 0; i < 5; i++)
+     {
+-        char configNameStr[20] = "ui:recentlyopen";
++        char configNameStr[46] = "ui:recentlyopen";
+         snprintf(configNameStr + 15, 20, "%d", i);
+         
+         iniparser_setstr(GBLsettingsDictionary, configNameStr, 
+diff -Naurp -p isomaster-1.3.7.orig/settings.h isomaster-1.3.7/settings.h
+--- isomaster-1.3.7.orig/settings.h	2010-01-09 14:18:00.330993252 +0100
++++ isomaster-1.3.7/settings.h	2010-01-09 14:34:59.495995595 +0100
+@@ -4,7 +4,7 @@
+ #include <stdbool.h>
+ 
+ #include "isomaster.h"
+-#include "iniparser-2.17/src/iniparser.h"
++#include <iniparser.h>
+ 
+ #define ISOMASTER_DEFAULT_WINDOW_WIDTH 500
+ #define ISOMASTER_DEFAULT_WINDOW_HEIGHT 550
diff --git a/app-cdr/isomaster/isomaster-1.3.7.ebuild b/app-cdr/isomaster/isomaster-1.3.7.ebuild
new file mode 100644
index 000000000000..2275066eded6
--- /dev/null
+++ b/app-cdr/isomaster/isomaster-1.3.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/isomaster/isomaster-1.3.7.ebuild,v 1.1 2010/01/09 14:41:59 idl0r Exp $
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Graphical CD image editor for reading, modifying and writing ISO images"
+HOMEPAGE="http://littlesvr.ca/isomaster"
+SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="nls"
+
+RDEPEND=">=x11-libs/gtk+-2:2
+	dev-libs/iniparser"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+MYFLAGS=""
+
+pkg_setup() {
+	MYFLAGS="PREFIX=/usr"
+
+	if ! use nls; then
+		MYFLAGS="${MYFLAGS} WITHOUT_NLS=1"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-noiniparser.patch"
+}
+
+# bug 274361
+src_configure() { :; }
+
+src_compile() {
+	tc-export CC
+	emake ${MYFLAGS} || die "emake failed"
+}
+
+src_install() {
+	emake ${MYFLAGS} DESTDIR="${D}" install || die "emake install failed"
+	dodoc {CHANGELOG,CREDITS,README,TODO}.TXT
+}