Use gsize instead of guint, patch by Radoslaw Szkodzinski, added ~amd64; bug 176604

Package-Manager: portage-2.1.2.6

4 files changed, 44 insertions, 17 deletions

diff --git a/app-misc/discomatic/ChangeLog b/app-misc/discomatic/ChangeLog
index 0bb5955162ea..9d33e025e590 100644
--- a/app-misc/discomatic/ChangeLog
+++ b/app-misc/discomatic/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/discomatic
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/discomatic/ChangeLog,v 1.9 2006/10/21 09:05:31 dertobi123 Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/discomatic/ChangeLog,v 1.10 2007/05/05 08:56:38 dertobi123 Exp $
+
+  05 May 2007; Tobias Scherbaum <dertobi123@gentoo.org>
+  +files/discomatic-0.3-glib.patch, discomatic-0.3.ebuild:
+  Use gsize instead of guint, patch by Radoslaw Szkodzinski, added ~amd64; bug
+  176604
 
   21 Oct 2006; Tobias Scherbaum <dertobi123@gentoo.org>
   discomatic-0.3.ebuild:
diff --git a/app-misc/discomatic/Manifest b/app-misc/discomatic/Manifest
index fe6cd180f335..52415d97169e 100644
--- a/app-misc/discomatic/Manifest
+++ b/app-misc/discomatic/Manifest
@@ -1,12 +1,16 @@
+AUX discomatic-0.3-glib.patch 360 RMD160 e8064ca89cfa5ca743f07a89e4c0365a2e23e47c SHA1 c338ae7b3766dc793b1b34164f2215ba15c55f94 SHA256 b77fd5eb2c38a90e44fcf1f622a82926178a5f2e9f6a5b23d1d598237655e855
+MD5 a0d018d4a40d656c076416155cf4a39c files/discomatic-0.3-glib.patch 360
+RMD160 e8064ca89cfa5ca743f07a89e4c0365a2e23e47c files/discomatic-0.3-glib.patch 360
+SHA256 b77fd5eb2c38a90e44fcf1f622a82926178a5f2e9f6a5b23d1d598237655e855 files/discomatic-0.3-glib.patch 360
 DIST discomatic-0.3.tar.bz2 99480 RMD160 9ea6693b9e4332fab83f1565c75daadf6f845ba0 SHA1 aa6b84dc8c65925626be7ef42ea786876117c4ab SHA256 fdbcebdb8a00713f869446cfb694f02a00ffce09c728733e5bcf0b10de9fa378
-EBUILD discomatic-0.3.ebuild 619 RMD160 76b01c574b7907bd20a07842e596918b8391448c SHA1 49825b2bf20ae9d3fb1e626d16e49b73e064c364 SHA256 b6427439f24643f5a7a35a6e22b3725ea8bcdeb9253dd8c74bddb8ead3893e03
-MD5 d02d6b47c4836cca538430c351162307 discomatic-0.3.ebuild 619
-RMD160 76b01c574b7907bd20a07842e596918b8391448c discomatic-0.3.ebuild 619
-SHA256 b6427439f24643f5a7a35a6e22b3725ea8bcdeb9253dd8c74bddb8ead3893e03 discomatic-0.3.ebuild 619
-MISC ChangeLog 965 RMD160 3556e493c47ecdcf048297217ca8b418cf7fdc03 SHA1 1bcc24bff1dcb521a7577cb52bed608d87162ae4 SHA256 cf487007c65a1fe3b773a400bfb9a123863cdcba10aafef3ea0698a042b1e4e4
-MD5 23091debfa4c8cc846865ddd0e26c672 ChangeLog 965
-RMD160 3556e493c47ecdcf048297217ca8b418cf7fdc03 ChangeLog 965
-SHA256 cf487007c65a1fe3b773a400bfb9a123863cdcba10aafef3ea0698a042b1e4e4 ChangeLog 965
+EBUILD discomatic-0.3.ebuild 727 RMD160 27fe4cb72fecc5fd1e42059a096f3680bd52717e SHA1 88607eb3f6c0972c107b8a63bc81ab64ece98cb7 SHA256 e5fa2359ab0b1ec9c5fd0d1b8fe222cd88f5a7e4ffac1802d614ccd8bf3bde52
+MD5 110b48823fe057bf62943173b703be5b discomatic-0.3.ebuild 727
+RMD160 27fe4cb72fecc5fd1e42059a096f3680bd52717e discomatic-0.3.ebuild 727
+SHA256 e5fa2359ab0b1ec9c5fd0d1b8fe222cd88f5a7e4ffac1802d614ccd8bf3bde52 discomatic-0.3.ebuild 727
+MISC ChangeLog 1170 RMD160 95e2438ff3772c8f8de1250a1398c6cacf177e5e SHA1 116bfb0a82ec0a403a6a975f0fe3539d1046379d SHA256 2b1518f43b5ce559340292a99cc39348bddebb9301e4eea973d02826d7646bba
+MD5 4232f74c8c113dcc4344ef565f3efd13 ChangeLog 1170
+RMD160 95e2438ff3772c8f8de1250a1398c6cacf177e5e ChangeLog 1170
+SHA256 2b1518f43b5ce559340292a99cc39348bddebb9301e4eea973d02826d7646bba ChangeLog 1170
 MISC metadata.xml 366 RMD160 8f94919f2f5a62d03330bde2d0382766b1646791 SHA1 5c8df6de756cf8336871d15231b02455dbcdc6bc SHA256 8473494b1cea44cf8f543f7fd4af8e247b9e85f0bb6a0c9e531da08223e7250e
 MD5 9476b750895f4c4ec44567eaaf774aed metadata.xml 366
 RMD160 8f94919f2f5a62d03330bde2d0382766b1646791 metadata.xml 366
diff --git a/app-misc/discomatic/discomatic-0.3.ebuild b/app-misc/discomatic/discomatic-0.3.ebuild
index 914b445116ae..4b0700c53821 100644
--- a/app-misc/discomatic/discomatic-0.3.ebuild
+++ b/app-misc/discomatic/discomatic-0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/discomatic/discomatic-0.3.ebuild,v 1.9 2006/10/21 09:05:31 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/discomatic/discomatic-0.3.ebuild,v 1.10 2007/05/05 08:56:38 dertobi123 Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="GTK+ CD-ROM archiving tool for mastering and burning multiple CD-ROM"
 HOMEPAGE="http://discomatic.sourceforge.net"
@@ -10,12 +10,19 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="ppc x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
-RDEPEND=">=dev-libs/glib-2.2
-	>=x11-libs/gtk+-2.2"
-DEPEND="${RDEPEND}
+RDEPEND="${DEPEND}
+	virtual/cdrtools"
+DEPEND=">=dev-libs/glib-2.2
+	>=x11-libs/gtk+-2.2
 	dev-util/pkgconfig"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-glib.patch
+}
+
 DOCS="AUTHORS ChangeLog INSTALL NEWS README* TODO"
diff --git a/app-misc/discomatic/files/discomatic-0.3-glib.patch b/app-misc/discomatic/files/discomatic-0.3-glib.patch
new file mode 100644
index 000000000000..0b155b909100
--- /dev/null
+++ b/app-misc/discomatic/files/discomatic-0.3-glib.patch
@@ -0,0 +1,11 @@
+--- discomatic-0.3/src/process.cpp.orig	2003-10-17 22:54:37.000000000 +0200
++++ discomatic-0.3/src/process.cpp	2007-04-30 18:34:43.000000000 +0200
+@@ -134,7 +134,7 @@
+ int Process::processInput(GIOChannel *source){
+   gchar buf;
+   gchar *buf2;
+-  guint count;
++  gsize count;
+   g_io_channel_read(source, &buf, 1, &count);
+   if(count){
+     if(buf == '\b'){