diff options
author | 2012-01-21 19:13:35 +0000 | |
---|---|---|
committer | 2012-01-21 19:13:35 +0000 | |
commit | 18512306cafb76fce74946e3c186b07bc031e457 (patch) | |
tree | 5201f33f0e0298ffacdac1c87205cb156eeba320 /app-cdr/isomaster | |
parent | Version bump wrt #399587 by "khorio" (diff) | |
download | historical-18512306cafb76fce74946e3c186b07bc031e457.tar.gz historical-18512306cafb76fce74946e3c186b07bc031e457.tar.bz2 historical-18512306cafb76fce74946e3c186b07bc031e457.zip |
old
Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64
Diffstat (limited to 'app-cdr/isomaster')
-rw-r--r-- | app-cdr/isomaster/ChangeLog | 9 | ||||
-rw-r--r-- | app-cdr/isomaster/Manifest | 27 | ||||
-rw-r--r-- | app-cdr/isomaster/files/isomaster-1.3.5-ldflags.diff | 4 | ||||
-rw-r--r-- | app-cdr/isomaster/files/isomaster-1.3.7-noiniparser.patch | 69 | ||||
-rw-r--r-- | app-cdr/isomaster/files/isomaster-1.3.8-gtk_file_chooser_get_current.patch | 99 | ||||
-rw-r--r-- | app-cdr/isomaster/files/isomaster-1.3.8-unbundle-iniparser.patch | 61 | ||||
-rw-r--r-- | app-cdr/isomaster/files/isomaster-1.3.9-asneeded.patch | 6 | ||||
-rw-r--r-- | app-cdr/isomaster/isomaster-1.3.7-r1.ebuild | 49 | ||||
-rw-r--r-- | app-cdr/isomaster/isomaster-1.3.8.ebuild | 52 |
9 files changed, 22 insertions, 354 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/Manifest b/app-cdr/isomaster/Manifest index 62c8a346fb39..e44fcf0a5fb1 100644 --- a/app-cdr/isomaster/Manifest +++ b/app-cdr/isomaster/Manifest @@ -1,29 +1,22 @@ -----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 -AUX isomaster-1.3.8-gtk_file_chooser_get_current.patch 3508 RMD160 b5865eea5c9847e5ba3779fa283ced40a345c582 SHA1 e093984e7108a37531486c35e08c37f80999a3d2 SHA256 9cc3f1c2d01ed61b4274f9939af30666ea4695829a106b81c46a08225a4cbe16 -AUX isomaster-1.3.8-unbundle-iniparser.patch 1661 RMD160 e6791e4e77ee2535f4d2639ed8c3aaf6073bdcac SHA1 258994c28b113d1d754d0916575e21df3c842bcc SHA256 387f4f7a614a6aa114fef7b9b7a62053d2864964434ae822bc3997d16be91045 -AUX isomaster-1.3.9-asneeded.patch 797 RMD160 a8ab9aaaa40ca7943e31f278be7fa73d0ab42670 SHA1 c389ccaadab138be3671c6e221155aff3d88e36c SHA256 df3c0188f6a7483e9f629479a0bb00b7298874d32f89a2e11d822d378c702b38 +AUX isomaster-1.3.5-ldflags.diff 434 RMD160 dc4f343cbf733086d59b0c5f96b70aae483b5d2e SHA1 c2c7e6d9b46adc0413b86dc34c382eb009cd1bb9 SHA256 cb3f5b724d847c6045e5b67e92b6ec9e85c0110d6d88b70c159cd8eb4e6119a5 +AUX isomaster-1.3.9-asneeded.patch 585 RMD160 65a4088e57687baa6dad8a20f8c3969ba1ab7296 SHA1 0436a4fec94b3d1951523db79e0ea9702536e801 SHA256 077574dc54d56ae7f22c91634d34f3304f9f41e13701c28e78fb7954417ce427 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 -DIST isomaster-1.3.8.tar.bz2 216102 RMD160 dcb7d84a2f6f6840bba865524680c9364e67e4d5 SHA1 3b5cce19899f63dd943930a2abc43812e6a08ff1 SHA256 9a6e8c5356cac3253501976f49c6b971d088da0fbfb6641d304ea8eda06ab30b DIST isomaster-1.3.9.tar.bz2 223514 RMD160 d237784666ead7c7a296008df4ee8abbcaa5abbb SHA1 5214f4e9b309adb1d3fb53d0617f142ef2dbbbf8 SHA256 2bf798a19af43113391144c4a3f2f3b33366f640c5695d356c151e83c49dc853 EBUILD isomaster-1.3.5.ebuild 881 RMD160 2532408437e6172688b208e74b177afb1d9df990 SHA1 e4acd2dce48c14987cc790154f22fb1034b7d089 SHA256 5bb0dfcb18a2d69969413616f0d92792e01d6eb8a46473f83d1f777a247489fb -EBUILD isomaster-1.3.7-r1.ebuild 1152 RMD160 fee4cb2ff9f98a3b8bd23996497bd17e982e9649 SHA1 e988f257660556457cc2b9352761e76a52a4fe9e SHA256 dad39cf51bf2703e65b617834fbe1691353327ebdfa76649d827e0a7550eb74d -EBUILD isomaster-1.3.8.ebuild 1253 RMD160 01aba5442c110db9ad4a8df4767b7b7ad69e9ffa SHA1 0f0ada304c5ea4e4553901a21e1b3eaba13d4d56 SHA256 5cee0e343fdf5a08933eba28ca09d74c01da43af994d0db5fc4f6022bd718ec2 EBUILD isomaster-1.3.9.ebuild 1112 RMD160 b035546bf7a34bb5ddc89186b36cfbe9e2475605 SHA1 8925b32c739111a49c0545a4f851f8064b4659d4 SHA256 e104032a919a9fcb6317f3e399a7c729ebcebdaf74937b2afab09300707f6db5 -MISC ChangeLog 3196 RMD160 14095821d465da99ffe8f3f1d1d35f24020c6236 SHA1 a3b254965cfa082ea5f2220e6402d00cce0c3693 SHA256 2226d98a50208d22437a1f724971edd48d9bb55829bbcaaebb6bdcc5a848f376 +MISC ChangeLog 3468 RMD160 2f40d2a4725f9f0627f29fd01ad6de5f7e75b0f8 SHA1 cb61a109b8c65b62a4e55de43fcf781438d4c372 SHA256 d31ae8c2684f89623e34cb9d78ffc676abd23f61e480f49608d5d9bdc5bc96c4 MISC metadata.xml 263 RMD160 23ac63910e182a037747a2e728cd360aea8931f3 SHA1 284748c7bbc9927feb894853669ca84a001651db SHA256 96a4922aeb9ae48b6e2725364ebc5016efe37a26e53b265c3bd693975eb737c8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJPGwzsAAoJEEdUh39IaPFNW3UIAJqkSH35mKU0ehOZanFVgC72 -EbqBIWeZqvrGEa/S81qIDQaw0popVqbE3pdI5j76GlNvQ59vl+FnbySbVco3w1tL -RV0bZNcYFJO04DwUoeb29X7ANNU9pNU7W2vWuGlRJcQ2hyvlXz2NYaIrbFL6Gp9C -amueYdmAsQiSc1/5kWpwPrG5IRMwKJ1cg20DTaFdRyJeJm03B0wn6GEN+u7/8UXd -eam3eA1n06nfdSwbWt2syyqvCp11Vo3i8y3sjBuOUoxaAW+/6QTmUi07ZHwmncCA -vJVzSbLzYjtVhgv9QjwiH4rinaJaIN3givzJVEmdMQnUwRaMWVRk6oNyLQCuviM= -=xUOO +iQEcBAEBAgAGBQJPGw3eAAoJEEdUh39IaPFN2BoH/iY6zcKvAHYDKhUrvQ26n3Ce +Qywtq2VNPKSYZStI7NBDTYM3qVw7bGTLRfITXUGBNivjAxZLFFW/aYAq0XAor4FQ +ic9vs9haCjRXZQtxsp/3HBmAoz5JnFpkYYiv8gYlneMtLZzUGVcK1dSEgdSHKpaK +CXFwRDhcaPYoTAhqaMpAZuuJUkT+vR1qS9L+0Cax2AfToF6bJij+IgMRjTJ5JVJT +00u+WbV3LzmQmUbfes6R7tIf+2YOEsKMBwX+5TVr6Xdqd5e5/G6gELM8CZxaIZF4 +6kvxiLM1za3LDl7agIV8jjM8PTR+I7QRUo+72ApBdOrCoCXyFa1dxR2UKU0nEGk= +=oCMK -----END PGP SIGNATURE----- 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 -} |