old

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

8 files changed, 12 insertions, 337 deletions

diff --git a/app-cdr/isomaster/ChangeLog b/app-cdr/isomaster/ChangeLog
index 946397d7d826..5dfc3ef3fc8d 100644
--- a/app-cdr/isomaster/ChangeLog
+++ b/app-cdr/isomaster/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-cdr/isomaster
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/isomaster/ChangeLog,v 1.18 2012/01/21 19:09:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/isomaster/ChangeLog,v 1.19 2012/01/21 19:13:35 ssuominen Exp $
+
+  21 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -isomaster-1.3.7-r1.ebuild, -files/isomaster-1.3.7-noiniparser.patch,
+  -isomaster-1.3.8.ebuild,
+  -files/isomaster-1.3.8-gtk_file_chooser_get_current.patch,
+  -files/isomaster-1.3.8-unbundle-iniparser.patch:
+  old
 
 *isomaster-1.3.9 (21 Jan 2012)
 
diff --git a/app-cdr/isomaster/files/isomaster-1.3.5-ldflags.diff b/app-cdr/isomaster/files/isomaster-1.3.5-ldflags.diff
index b735853cee2b..8f328912552d 100644
--- a/app-cdr/isomaster/files/isomaster-1.3.5-ldflags.diff
+++ b/app-cdr/isomaster/files/isomaster-1.3.5-ldflags.diff
@@ -1,5 +1,5 @@
---- isomaster-1.3.5/Makefile.orig	2009-04-07 14:03:56.000000000 +0200
-+++ isomaster-1.3.5/Makefile	2009-04-07 14:04:04.000000000 +0200
+--- Makefile
++++ Makefile
 @@ -64,7 +64,7 @@
  
  isomaster: $(OBJECTS) lib iniparser
diff --git a/app-cdr/isomaster/files/isomaster-1.3.7-noiniparser.patch b/app-cdr/isomaster/files/isomaster-1.3.7-noiniparser.patch
deleted file mode 100644
index 9ee607b2e43b..000000000000
--- a/app-cdr/isomaster/files/isomaster-1.3.7-noiniparser.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-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/files/isomaster-1.3.8-gtk_file_chooser_get_current.patch b/app-cdr/isomaster/files/isomaster-1.3.8-gtk_file_chooser_get_current.patch
deleted file mode 100644
index ca8d178e369a..000000000000
--- a/app-cdr/isomaster/files/isomaster-1.3.8-gtk_file_chooser_get_current.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From eabb3f85d12121409f901d64c556a9f579c11864 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 7 Jan 2012 19:30:52 +0100
-Subject: [PATCH] Handle NULL return from
- gtk_file_chooser_get_current_folder()
-
----
- isobrowser.c |   53 ++++++++++++++++++++++++++++++++++-------------------
- 1 files changed, 34 insertions(+), 19 deletions(-)
-
-diff --git a/isobrowser.c b/isobrowser.c
-index c03548b..e108f03 100644
---- a/isobrowser.c
-+++ b/isobrowser.c
-@@ -9,6 +9,7 @@
- * Andrew Smith, http://littlesvr.ca/misc/contactandrew.php
- *
- * Contributors:
-+* Sebastian Pipping <sebastian@pipping.org>
- * 
- ******************************************************************************/
- 
-@@ -1454,19 +1455,26 @@ gboolean openIsoCbk(GtkMenuItem* menuItem, gpointer data)
-         
-         /* RECORD last iso dir */
-         char* lastIsoDir = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialog));
--        
--        if(GBLappSettings.lastIsoDir != NULL && strlen(lastIsoDir) > strlen(GBLappSettings.lastIsoDir))
-+        if(lastIsoDir)
-+        {
-+            if(GBLappSettings.lastIsoDir != NULL && strlen(lastIsoDir) > strlen(GBLappSettings.lastIsoDir))
-+            {
-+                free(GBLappSettings.lastIsoDir);
-+                GBLappSettings.lastIsoDir = NULL;
-+            }
-+
-+            if(GBLappSettings.lastIsoDir == NULL)
-+                GBLappSettings.lastIsoDir = malloc(strlen(lastIsoDir) + 1);
-+
-+            strcpy(GBLappSettings.lastIsoDir, lastIsoDir);
-+
-+            g_free(lastIsoDir);
-+        }
-+        else /* e.g. when opening a file from the <Recently used> view */
-         {
-             free(GBLappSettings.lastIsoDir);
-             GBLappSettings.lastIsoDir = NULL;
-         }
--        
--        if(GBLappSettings.lastIsoDir == NULL)
--            GBLappSettings.lastIsoDir = malloc(strlen(lastIsoDir) + 1);
--        
--        strcpy(GBLappSettings.lastIsoDir, lastIsoDir);
--        
--        g_free(lastIsoDir);
-         /* END RECORD last iso dir */
-     }
-     
-@@ -1758,20 +1766,27 @@ gboolean saveIsoCbk(GtkWidget *widget, GdkEvent *event)
-         
-         /* RECORD last iso dir */
-         char* lastIsoDir = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialog));
--        
--        if(GBLappSettings.lastIsoDir != NULL && strlen(lastIsoDir) > strlen(GBLappSettings.lastIsoDir))
-+        if(lastIsoDir)
-+        {
-+            if(GBLappSettings.lastIsoDir != NULL && strlen(lastIsoDir) > strlen(GBLappSettings.lastIsoDir))
-+            {
-+                free(GBLappSettings.lastIsoDir);
-+                GBLappSettings.lastIsoDir = NULL;
-+            }
-+
-+            if(GBLappSettings.lastIsoDir == NULL)
-+                GBLappSettings.lastIsoDir = malloc(strlen(lastIsoDir) + 1);
-+
-+            strcpy(GBLappSettings.lastIsoDir, lastIsoDir);
-+
-+            g_free(lastIsoDir);
-+        }
-+        else /* e.g. when opening a file from the <Recently used> view */
-         {
-             free(GBLappSettings.lastIsoDir);
-             GBLappSettings.lastIsoDir = NULL;
-         }
--        
--        if(GBLappSettings.lastIsoDir == NULL)
--            GBLappSettings.lastIsoDir = malloc(strlen(lastIsoDir) + 1);
--        
--        strcpy(GBLappSettings.lastIsoDir, lastIsoDir);
--        
--        g_free(lastIsoDir);
--        /* END RECORD iso save dir */
-+        /* END RECORD last iso dir */
-         
-         askedToAddExtension = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(addExtensionCheckbox));
-     }
--- 
-1.7.8.3
-
diff --git a/app-cdr/isomaster/files/isomaster-1.3.8-unbundle-iniparser.patch b/app-cdr/isomaster/files/isomaster-1.3.8-unbundle-iniparser.patch
deleted file mode 100644
index 5d3746897942..000000000000
--- a/app-cdr/isomaster/files/isomaster-1.3.8-unbundle-iniparser.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 598606c7b96e421ffbcb09ccd9aac61fa83cd0fe Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 7 Jan 2012 17:42:13 +0100
-Subject: [PATCH] Unbundle iniparser, fix use of compile/link flags
-
----
- Makefile |   10 +++-------
- 1 files changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 363a36a..c0434fb 100644
---- a/Makefile
-+++ b/Makefile
-@@ -65,21 +65,18 @@ OBJECTS = isomaster.o window.o browser.o fsbrowser.o isobrowser.o error.o about.
- 
- 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 --git a/settings.h b/settings.h
-index fda67b7..e619e0c 100644
---- a/settings.h
-+++ b/settings.h
-@@ -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
--- 
-1.7.8.3
diff --git a/app-cdr/isomaster/files/isomaster-1.3.9-asneeded.patch b/app-cdr/isomaster/files/isomaster-1.3.9-asneeded.patch
index fc4c2d4350a2..102f54db4a1a 100644
--- a/app-cdr/isomaster/files/isomaster-1.3.9-asneeded.patch
+++ b/app-cdr/isomaster/files/isomaster-1.3.9-asneeded.patch
@@ -1,6 +1,5 @@
-diff -ur isomaster-1.3.9.orig/Makefile isomaster-1.3.9/Makefile
---- isomaster-1.3.9.orig/Makefile	2012-01-19 21:58:06.000000000 +0200
-+++ isomaster-1.3.9/Makefile	2012-01-21 21:04:18.952310071 +0200
+--- Makefile
++++ Makefile
 @@ -75,9 +75,9 @@
  isomaster: $(OBJECTS) lib iniparser
  	@echo 'Linking isomaster'
@@ -13,4 +12,3 @@ diff -ur isomaster-1.3.9.orig/Makefile isomaster-1.3.9/Makefile
  endif
  
  # static pattern rule
-Only in isomaster-1.3.9: Makefile.orig
diff --git a/app-cdr/isomaster/isomaster-1.3.7-r1.ebuild b/app-cdr/isomaster/isomaster-1.3.7-r1.ebuild
deleted file mode 100644
index eed6a82ed1f7..000000000000
--- a/app-cdr/isomaster/isomaster-1.3.7-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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-r1.ebuild,v 1.1 2010/06/03 14:25:22 beandog 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"
-		MYFLAGS="${MYFLAGS} MYDOCPATH=/usr/share/doc/${PF}/bkisofs"
-		MYFLAGS="${MYFLAGS} ICONPATH=/usr/share/pixmaps/${PN}"
-	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
-}
diff --git a/app-cdr/isomaster/isomaster-1.3.8.ebuild b/app-cdr/isomaster/isomaster-1.3.8.ebuild
deleted file mode 100644
index c865e3feb347..000000000000
--- a/app-cdr/isomaster/isomaster-1.3.8.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/isomaster/isomaster-1.3.8.ebuild,v 1.1 2012/01/07 18:42:47 sping 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"
-		MYFLAGS="${MYFLAGS} MYDOCPATH=/usr/share/doc/${PF}/bkisofs"
-		MYFLAGS="${MYFLAGS} ICONPATH=/usr/share/pixmaps/${PN}"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-unbundle-iniparser.patch
-	rm -R iniparser-2.17 || die
-
-	epatch "${FILESDIR}"/${P}-gtk_file_chooser_get_current.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 || die
-}