Added a patch to fix gcc41 compile issues. Removed older versions.

(Portage version: 2.1_pre6-r3)

10 files changed, 70 insertions, 106 deletions

diff --git a/app-cdr/gcombust/ChangeLog b/app-cdr/gcombust/ChangeLog
index 65c852941a35..89d98a09c489 100644
--- a/app-cdr/gcombust/ChangeLog
+++ b/app-cdr/gcombust/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-cdr/gcombust
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gcombust/ChangeLog,v 1.24 2005/12/29 03:32:28 metalgod Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gcombust/ChangeLog,v 1.25 2006/03/19 01:52:31 metalgod Exp $
+
+*gcombust-0.1.55-r1 (19 Mar 2006)
+
+  19 Mar 2006; Luis Medinas <metalgod@gentoo.org>
+  +files/gcombust-0.1.55-gcc41.patch, -gcombust-0.1.52.ebuild,
+  -gcombust-0.1.53.ebuild, -gcombust-0.1.54.ebuild,
+  +gcombust-0.1.55-r1.ebuild:
+  Added a patch to fix gcc41 compile issues. Removed older versions.
 
   29 Dec 2005; Luis Medinas <metalgod@gentoo.org> +metadata.xml:
   Add this package to media-optical herd.
diff --git a/app-cdr/gcombust/Manifest b/app-cdr/gcombust/Manifest
index ad855c1fadb6..3132b7b6fc89 100644
--- a/app-cdr/gcombust/Manifest
+++ b/app-cdr/gcombust/Manifest
@@ -1,20 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 46a5d6a09f748ea286a4bf2abbc4811e ChangeLog 2604
-MD5 640585b53e3c5c0e02f6edbe3e32ab18 files/digest-gcombust-0.1.52 67
-MD5 83d876f765b3b24ad3a8e1215e072946 files/digest-gcombust-0.1.53 67
-MD5 ab6942c39b304f056d9152604d58250d files/digest-gcombust-0.1.54 67
+RMD160 b75e7bcd1a77649e5f799f3b1bb409e59caf4c3f ChangeLog 2604
+SHA256 00fb357b558733357a5ae847028091c15093fd95108be2a28f40a5280887e2de ChangeLog 2604
 MD5 984f834bc69c82ea39efa9884c0ba85d files/digest-gcombust-0.1.55 67
-MD5 b73c13d87d1adcd44d14174565b2b1fd gcombust-0.1.52.ebuild 937
-MD5 906bdb5b053075047d7d6e341a795b33 gcombust-0.1.53.ebuild 936
-MD5 f26ca6b5616d0bc0d13ef3acc329604d gcombust-0.1.54.ebuild 943
+RMD160 ac45f5c896f3ed95461cfb77905883d63c75df2f files/digest-gcombust-0.1.55 67
+SHA256 d8734bdaa2063696689a641cb64b5af08421f49d3c24861e531d584c66d46539 files/digest-gcombust-0.1.55 67
+MD5 d47d8acbafdb2ab1663bb3c11bfb15bc files/digest-gcombust-0.1.55-r1 247
+RMD160 d66fae7381f5337bc8fa402958097f8f1e95f968 files/digest-gcombust-0.1.55-r1 247
+SHA256 a8b0ff045b1f23a9090a61bce2c15c99ac5506d250509ee59519c8f66e9552fc files/digest-gcombust-0.1.55-r1 247
+MD5 5b5f6fe10f474d5b59c41660a744cf32 files/gcombust-0.1.55-gcc41.patch 1105
+RMD160 3a490923c2b55bce42ceeff23af6e1f161b39679 files/gcombust-0.1.55-gcc41.patch 1105
+SHA256 0052361bb21692a021d489dcba4b849aafb65eadd2a2b57be266d2ea55fc57c1 files/gcombust-0.1.55-gcc41.patch 1105
+MD5 2cbfca51ae7b65b3a6ef79dd3ad06d89 gcombust-0.1.55-r1.ebuild 1111
+RMD160 48ca9429bc682a01a66a7ac7f37d298c6307651b gcombust-0.1.55-r1.ebuild 1111
+SHA256 dc2e0c44903790ab28c4c0f804de5d2dc6e366ddeee11228199a52971ef696fe gcombust-0.1.55-r1.ebuild 1111
 MD5 939dbc356faefc298bc517d1ef1c36a0 gcombust-0.1.55.ebuild 1050
+RMD160 799ef05415759ebc9eb8f54cca2b5a0cac1b7d94 gcombust-0.1.55.ebuild 1050
+SHA256 a1c0c5b11e54643e1b65b490494df25fc6aa4e28ad8e0b6e6c5f2a14599a26c2 gcombust-0.1.55.ebuild 1050
 MD5 4ce63071510202110ebc72dd9ee3924e metadata.xml 214
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDs1j+wUpWvClEHQoRAkBvAJ9jQtaa8a0fdq8tiH3mK85fj5G1YwCfdegs
-s8pfFN9pnPeYgkUr41zs+YY=
-=fiKo
------END PGP SIGNATURE-----
+RMD160 4120d9f1b831e1e14b793d69fcac8404e240747f metadata.xml 214
+SHA256 f246585065033926d43d6fb617cf1c19cca0dd470c7efa44cbf957a9fa9e07b7 metadata.xml 214
diff --git a/app-cdr/gcombust/files/digest-gcombust-0.1.52 b/app-cdr/gcombust/files/digest-gcombust-0.1.52
deleted file mode 100644
index 8aaaa0aadf5a..000000000000
--- a/app-cdr/gcombust/files/digest-gcombust-0.1.52
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2c2455f8fe91cddd7b87bf59916a39e8 gcombust-0.1.52.tar.gz 761347
diff --git a/app-cdr/gcombust/files/digest-gcombust-0.1.53 b/app-cdr/gcombust/files/digest-gcombust-0.1.53
deleted file mode 100644
index e6bb4d9adf58..000000000000
--- a/app-cdr/gcombust/files/digest-gcombust-0.1.53
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c27d379b53ee7d05344371481d22c65d gcombust-0.1.53.tar.gz 770451
diff --git a/app-cdr/gcombust/files/digest-gcombust-0.1.54 b/app-cdr/gcombust/files/digest-gcombust-0.1.54
deleted file mode 100644
index ab9aec231fe9..000000000000
--- a/app-cdr/gcombust/files/digest-gcombust-0.1.54
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a6fbb8a6ddf9dbfcd6e78b54e0d1bd00 gcombust-0.1.54.tar.gz 786628
diff --git a/app-cdr/gcombust/files/digest-gcombust-0.1.55-r1 b/app-cdr/gcombust/files/digest-gcombust-0.1.55-r1
new file mode 100644
index 000000000000..3eba0c1279c9
--- /dev/null
+++ b/app-cdr/gcombust/files/digest-gcombust-0.1.55-r1
@@ -0,0 +1,3 @@
+MD5 25ddecef7f8556f0fac82d9d4927e8eb gcombust-0.1.55.tar.gz 819339
+RMD160 db6e77eeb9ba56af55ac6af8a279205104b325f3 gcombust-0.1.55.tar.gz 819339
+SHA256 5e6b11049c305e44f20c45a488ea704f11cf14fe59efb6c8a38021b64e595e2e gcombust-0.1.55.tar.gz 819339
diff --git a/app-cdr/gcombust/files/gcombust-0.1.55-gcc41.patch b/app-cdr/gcombust/files/gcombust-0.1.55-gcc41.patch
new file mode 100644
index 000000000000..89e78c29713a
--- /dev/null
+++ b/app-cdr/gcombust/files/gcombust-0.1.55-gcc41.patch
@@ -0,0 +1,24 @@
+diff -urN ../tmp-orig/gcombust-0.1.55/src/optimize_usage.c ./src/optimize_usage.c
+--- ../tmp-orig/gcombust-0.1.55/src/optimize_usage.c	2003-06-30 15:07:27.000000000 +0200
++++ ./src/optimize_usage.c	2004-12-20 16:29:48.012513000 +0100
+@@ -31,7 +31,7 @@
+ #include "locks.h"
+ #include "globals.h"
+ 
+-static GtkWidget *opt_try_harder;
++GtkWidget *opt_try_harder;
+ 
+ static GtkWidget *cdsize_option_menu, *cdsize_selected_label, *cdsector_selected_label;
+ static GtkWidget *used_size_label, *used_sectors_label, *wasted_size_label, *wasted_sectors_label;
+diff -urN ../tmp-orig/gcombust-0.1.55/src/rip_audio.c ./src/rip_audio.c
+--- ../tmp-orig/gcombust-0.1.55/src/rip_audio.c	2002-02-16 21:00:52.000000000 +0100
++++ ./src/rip_audio.c	2004-12-20 16:30:05.285887048 +0100
+@@ -41,7 +41,7 @@
+ char *cdda2wav_path = NULL, *cdda_device_path;
+ char *def_rip_path = NULL;
+ char *cdparanoia_path = NULL, *cdpara_device_path;
+-static GtkWidget *rip_path_entry;
++GtkWidget *rip_path_entry;
+ 
+ static GtkWidget *rip_win = NULL, *p_win;
+ static GtkWidget *autoscroll_cdda2wav_text, *cdda2wav_text, *cdda2wav_text_scrollbar;
diff --git a/app-cdr/gcombust/gcombust-0.1.52.ebuild b/app-cdr/gcombust/gcombust-0.1.52.ebuild
deleted file mode 100644
index 2d70a7a16ccf..000000000000
--- a/app-cdr/gcombust/gcombust-0.1.52.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gcombust/gcombust-0.1.52.ebuild,v 1.15 2005/01/01 12:13:37 eradicator Exp $
-
-DESCRIPTION="A GUI for mkisofs/mkhybrid/cdda2wav/cdrecord/cdlabelgen"
-HOMEPAGE="http://www.abo.fi/~jmunsin/gcombust/"
-SRC_URI="http://www.abo.fi/~jmunsin/gcombust/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc"
-IUSE="nls"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	nls? ( sys-devel/gettext )"
-RDEPEND="app-cdr/cdrtools"
-
-src_compile() {
-	local myconf
-
-	if ! use nls
-	then
-		myconf="${myconf} --disable-nls"
-		touch intl/libintl.h
-	else
-		myconf="${myconf} --enable-nls"
-	fi
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		${myconf} \
-		|| die
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr install || die
-	dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS TODO
-	dohtml -a shtml FAQ.shtml
-}
diff --git a/app-cdr/gcombust/gcombust-0.1.53.ebuild b/app-cdr/gcombust/gcombust-0.1.53.ebuild
deleted file mode 100644
index 9bcb1ac08c97..000000000000
--- a/app-cdr/gcombust/gcombust-0.1.53.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gcombust/gcombust-0.1.53.ebuild,v 1.9 2005/01/01 12:13:37 eradicator Exp $
-
-DESCRIPTION="A GUI for mkisofs/mkhybrid/cdda2wav/cdrecord/cdlabelgen"
-HOMEPAGE="http://www.abo.fi/~jmunsin/gcombust/"
-SRC_URI="http://www.abo.fi/~jmunsin/gcombust/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc"
-IUSE="nls"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	nls? ( sys-devel/gettext )"
-RDEPEND="app-cdr/cdrtools"
-
-src_compile() {
-	local myconf
-
-	if ! use nls
-	then
-		myconf="${myconf} --disable-nls"
-		touch intl/libintl.h
-	else
-		myconf="${myconf} --enable-nls"
-	fi
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		${myconf} \
-		|| die
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr install || die
-	dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS TODO
-	dohtml -a shtml FAQ.shtml
-}
diff --git a/app-cdr/gcombust/gcombust-0.1.54.ebuild b/app-cdr/gcombust/gcombust-0.1.55-r1.ebuild
index f466ea3473c1..1f6c44ca6d9c 100644
--- a/app-cdr/gcombust/gcombust-0.1.54.ebuild
+++ b/app-cdr/gcombust/gcombust-0.1.55-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gcombust/gcombust-0.1.54.ebuild,v 1.10 2005/01/01 12:13:37 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gcombust/gcombust-0.1.55-r1.ebuild,v 1.1 2006/03/19 01:52:31 metalgod Exp $
+
+inherit eutils gnuconfig
 
 DESCRIPTION="A GUI for mkisofs/mkhybrid/cdda2wav/cdrecord/cdlabelgen."
 HOMEPAGE="http://www.abo.fi/~jmunsin/gcombust/"
@@ -8,7 +10,7 @@ SRC_URI="http://www.abo.fi/~jmunsin/gcombust/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="nls"
 
 DEPEND="=x11-libs/gtk+-1.2*
@@ -16,6 +18,17 @@ DEPEND="=x11-libs/gtk+-1.2*
 RDEPEND="${DEPEND}
 	app-cdr/cdrtools"
 
+src_unpack() {
+	if [ "${A}" != "" ]; then
+		unpack ${A}
+	fi
+	gnuconfig_update
+
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-gcc41.patch
+}
+
 src_compile() {
 	local myconf