Revision bump, which includes ppc64 patch

Package-Manager: portage-2.0.51.19

5 files changed, 252 insertions, 19 deletions

diff --git a/app-cdr/cdrdao/ChangeLog b/app-cdr/cdrdao/ChangeLog
index 262aad721854..e7494dbb52a8 100644
--- a/app-cdr/cdrdao/ChangeLog
+++ b/app-cdr/cdrdao/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/cdrdao
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.58 2005/01/01 12:10:26 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.59 2005/03/13 20:51:01 corsair Exp $
+
+*cdrdao-1.1.9-r1 (13 Mar 2005)
+
+  13 Mar 2005; Markus Rothe <corsair@gentoo.org>
+  +files/cdrdao-1.1.9-ppc64.patch, +cdrdao-1.1.9-r1.ebuild:
+  Revision bump, which includes ppc64 patch
 
   20 Dec 2004; Dylan Carlson <absinthe@gentoo.org> cdrdao-1.1.9.ebuild:
   Stable on amd64.
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
index d43898e74cda..abe100ee0f9b 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -1,29 +1,22 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0e5c3462119826e615d6bf8cacfd103c ChangeLog 7968
+MD5 b111447b1ba85eddc9e0b378447bf972 ChangeLog 8151
 MD5 eabea7c61116301e189d721177fe8a48 cdrdao-1.1.7-r3.ebuild 3011
-MD5 bab69ebf527bd1791f4969f30c35cb38 metadata.xml 417
-MD5 a9caa6ac8a1796446b0477b84dd7ee26 cdrdao-1.1.8.ebuild 1838
 MD5 e6a5ac88f525203d18cebd6adb0d14c2 cdrdao-1.1.8-r1.ebuild 2214
+MD5 a9caa6ac8a1796446b0477b84dd7ee26 cdrdao-1.1.8.ebuild 1838
 MD5 4e6e7a3f51cecd9a59647998040741cc cdrdao-1.1.9.ebuild 1951
+MD5 bab69ebf527bd1791f4969f30c35cb38 metadata.xml 417
+MD5 e8e8dd56cf9148de96b3bca33c19dbc6 cdrdao-1.1.9-r1.ebuild 2026
+MD5 6f398aabdbd1ed1aa966f460fdbac3d2 files/1.1.8-gcc34.patch 10476
 MD5 3ea011fa1308fc478529300a80443aab files/cdrdao-1.1.5-c++.patch 1622
 MD5 3a9cce439930ba175e84bf2b82c61df5 files/cdrdao-1.1.5-gentoo.diff 19479
 MD5 46fb619628173aa68a337e7d49dd25b6 files/cdrdao-1.1.7-gentoo-version.patch 753
-MD5 4982087a6a964cb6f399cef0b52ab638 files/digest-cdrdao-1.1.8 65
 MD5 a7dc4823c3a7d7582f9b87afdddb51e0 files/cdrdao-1.1.7-r2-mp32dao-gentoo.diff 779
-MD5 bfcab12a6211829eb71aa6ee3d0245be files/gcdmaster.desktop 127
-MD5 e21496bf5b1e2efcd09be0b16241b165 files/digest-cdrdao-1.1.7-r3 69
-MD5 4982087a6a964cb6f399cef0b52ab638 files/digest-cdrdao-1.1.8-r1 65
-MD5 6f398aabdbd1ed1aa966f460fdbac3d2 files/1.1.8-gcc34.patch 10476
 MD5 af6e60d9309156e8c64fafebfdd79e97 files/cdrdao-1.1.8-cast.patch 351
 MD5 1fd823e821f7407e5a49d410b1cf238a files/cdrdao-1.1.9-cast.patch 347
+MD5 e21496bf5b1e2efcd09be0b16241b165 files/digest-cdrdao-1.1.7-r3 69
+MD5 4982087a6a964cb6f399cef0b52ab638 files/digest-cdrdao-1.1.8 65
+MD5 4982087a6a964cb6f399cef0b52ab638 files/digest-cdrdao-1.1.8-r1 65
 MD5 2c45c0fc635b97b04317d564cb810c41 files/digest-cdrdao-1.1.9 65
+MD5 bfcab12a6211829eb71aa6ee3d0245be files/gcdmaster.desktop 127
 MD5 26ca1675cea490f4807b4f365b923d51 files/cdrdao-Project.h-gcc3.4.patch 753
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFB24LUroRuSHgZdywRApjjAKCORdaxB38xYIwi3VFz11AZxEcBAwCeIvox
-xaXBUtrPWC8wnKkU2GSOjhM=
-=ZS2E
------END PGP SIGNATURE-----
+MD5 91898eebd71b9a81fa6e7d61652f6152 files/cdrdao-1.1.9-ppc64.patch 5217
+MD5 2c45c0fc635b97b04317d564cb810c41 files/digest-cdrdao-1.1.9-r1 65
diff --git a/app-cdr/cdrdao/cdrdao-1.1.9-r1.ebuild b/app-cdr/cdrdao/cdrdao-1.1.9-r1.ebuild
new file mode 100644
index 000000000000..2600b68418b2
--- /dev/null
+++ b/app-cdr/cdrdao/cdrdao-1.1.9-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.9-r1.ebuild,v 1.1 2005/03/13 20:51:01 corsair Exp $
+
+inherit flag-o-matic eutils gcc
+
+DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
+HOMEPAGE="http://cdrdao.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cdrdao/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gnome debug"
+RESTRICT="nostrip"
+
+RDEPEND=">=media-sound/lame-3.90
+	gnome? ( =dev-cpp/gtkmm-2.2*
+		=dev-cpp/libgnomemm-2.0*
+		=dev-cpp/libgnomecanvasmm-2.0*
+		=dev-cpp/gconfmm-2.0*
+		=dev-cpp/libgnomeuimm-2.0.0 )"
+DEPEND=">=dev-util/pccts-1.33.24-r1
+	virtual/cdrtools
+	${RDEPEND}"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+
+	# apply patch to allow xdao to be compiled with gcc3.4
+	epatch ${FILESDIR}/cdrdao-Project.h-gcc3.4.patch
+
+	# Add ppc64 support
+	epatch ${FILESDIR}/${P}-ppc64.patch
+
+	# Add gentoo to version
+	sed -i -e "s:^PACKAGE_STRING='cdrdao 1.1.9':PACKAGE_STRING='cdrdao 1.1.9 gentoo':" configure
+
+	# Display better SCSI messages (advise from Bug 43003)
+	cd scsilib/include
+	sed -i -e 's:HAVE_SCANSTACK:NO_FRIGGING_SCANSTACK:g' xmconfig.h
+	sed -i -e 's:HAVE_SCANSTACK:NO_FRIGGING_SCANSTACK:g' mconfig.h
+
+	if [ "${ARCH}" = "amd64" ]
+	then
+		cd ${S}
+		epatch ${FILESDIR}/${P}-cast.patch
+		cd scsilib/RULES
+		cp i686-linux-cc.rul x86_64-linux-cc.rul
+	fi
+}
+
+src_compile() {
+	# -funroll-loops do not work
+	filter-flags "-funroll-loops"
+
+	./configure --build="${CHOST}"\
+		--host="${CHOST}" \
+		--prefix=/usr \
+		`use_enable debug debug` \
+		`use_with gnome xdao` || die "configure failed"
+
+	emake || die
+}
+
+src_install() {
+	einstall || die "could not install"
+
+	cd ${S}
+
+	# Desktop Icon
+	if use gnome
+	then
+		insinto /usr/share/pixmaps
+		doins xdao/stock/gcdmaster.png
+		insinto /usr/share/gnome/apps/Applications
+		doins ${FILESDIR}/gcdmaster.desktop
+	fi
+
+	# Documentation
+	dodoc AUTHORS CREDITS ChangeLog NEWS README*
+}
+
diff --git a/app-cdr/cdrdao/files/cdrdao-1.1.9-ppc64.patch b/app-cdr/cdrdao/files/cdrdao-1.1.9-ppc64.patch
new file mode 100644
index 000000000000..c42252eefeaf
--- /dev/null
+++ b/app-cdr/cdrdao/files/cdrdao-1.1.9-ppc64.patch
@@ -0,0 +1,148 @@
+diff -ruN --recursive scsilib/RULES.orig/ppc64-linux-cc.rul scsilib/RULES/ppc64-linux-cc.rul
+--- scsilib/RULES.orig/ppc64-linux-cc.rul	1970-01-01 00:00:00.000000000 +0000
++++ scsilib/RULES/ppc64-linux-cc.rul	2004-12-23 16:02:37.343901376 +0000
+@@ -0,0 +1,70 @@
++#ident "@(#)i586-linux-cc.rul	1.5 02/10/15 "
++###########################################################################
++# Written 1996 by J. Schilling
++###########################################################################
++#
++# Platform dependent MACROS for Linux
++#
++###########################################################################
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; see the file COPYING.  If not, write to
++# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
++###########################################################################
++include $(SRCROOT)/$(RULESDIR)/rules.prg
++###########################################################################
++
++CPPFLAGS=	$(CPPOPTS) $(CPPOPTX)
++CFLAGS=		$(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX)
++
++CPPOPTS=	-I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
++COPTS=
++CWOPTS=		-Wall -Wtraditional \
++		-Wshadow -Wmissing-prototypes -Wstrict-prototypes
++COPTOPT=	-O
++KDEFINES=	-DKERNEL -D_KERNEL
++COPTDYN=	-fpic
++COPTGPROF=	-pg
++
++LIB_PREFIX=	lib
++LIB_SUFFIX=	.a
++SHL_SUFFIX=	.so.1.0
++
++#LIB_SOCKET=	-lsocket -lnsl -ldl
++LIB_SOCKET=	
++LIB_MATH=	-lm
++#LIB_KVM=	-lkvm
++LIB_KVM=	
++
++LIBS_PATH=	-L$(OLIBSDIR)
++
++LDFLAGS=	$(LDOPTS) $(LDOPTX)
++LDLIBS=		$(LIBS) $(LIBX)
++
++#LDOPTS=		$(LIBS_PATH) $(LDPATH) $(RUNPATH)
++LDOPTS=		$(LIBS_PATH) $(LDPATH)
++LDOPTDYN=	-shared -Wl,-soname,$(TARGET)
++LNDYNLIB=	@$(SYMLINK) $(TARGET) $(PTARGET_BASE).so
++
++FLOAT_OPTIONS=	
++
++CC=		@echo "	==> COMPILING \"$@\""; gcc
++LDCC=		@echo "	==> LINKING \"$@\""; gcc
++DYNLD=		@echo "	==> LINKING dynamic library \"$@\""; gcc
++RANLIB=		@echo "	==> RANDOMIZING ARCHIVE \"$@\""; true
++ARFLAGS=	cr
++LORDER=		echo
++TSORT=		cat
++
++RMDEP=		:
++MKDEP=		@echo "	==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
++MKDEP_OUT=
+diff -ruN --recursive scsilib/RULES.orig/ppc64-linux-gcc.rul scsilib/RULES/ppc64-linux-gcc.rul
+--- scsilib/RULES.orig/ppc64-linux-gcc.rul	1970-01-01 00:00:00.000000000 +0000
++++ scsilib/RULES/ppc64-linux-gcc.rul	2004-12-23 16:02:43.008978904 +0000
+@@ -0,0 +1,70 @@
++#ident "@(#)i586-linux-gcc.rul	1.5 02/10/15 "
++###########################################################################
++# Written 1996 by J. Schilling
++###########################################################################
++#
++# Platform dependent MACROS for Linux
++#
++###########################################################################
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; see the file COPYING.  If not, write to
++# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
++###########################################################################
++include $(SRCROOT)/$(RULESDIR)/rules.prg
++###########################################################################
++
++CPPFLAGS=	$(CPPOPTS) $(CPPOPTX)
++CFLAGS=		$(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX)
++
++CPPOPTS=	-I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
++COPTS=
++CWOPTS=		-Wall -Wtraditional \
++		-Wshadow -Wmissing-prototypes -Wstrict-prototypes
++COPTOPT=	-O
++KDEFINES=	-DKERNEL -D_KERNEL
++COPTDYN=	-fpic
++COPTGPROF=	-pg
++
++LIB_PREFIX=	lib
++LIB_SUFFIX=	.a
++SHL_SUFFIX=	.so.1.0
++
++#LIB_SOCKET=	-lsocket -lnsl -ldl
++LIB_SOCKET=	
++LIB_MATH=	-lm
++#LIB_KVM=	-lkvm
++LIB_KVM=	
++
++LIBS_PATH=	-L$(OLIBSDIR)
++
++LDFLAGS=	$(LDOPTS) $(LDOPTX)
++LDLIBS=		$(LIBS) $(LIBX)
++
++#LDOPTS=		$(LIBS_PATH) $(LDPATH) $(RUNPATH)
++LDOPTS=		$(LIBS_PATH) $(LDPATH)
++LDOPTDYN=	-shared -Wl,-soname,$(TARGET)
++LNDYNLIB=	@$(SYMLINK) $(TARGET) $(PTARGET_BASE).so
++
++FLOAT_OPTIONS=	
++
++CC=		@echo "	==> COMPILING \"$@\""; gcc
++LDCC=		@echo "	==> LINKING \"$@\""; gcc
++DYNLD=		@echo "	==> LINKING dynamic library \"$@\""; gcc
++RANLIB=		@echo "	==> RANDOMIZING ARCHIVE \"$@\""; true
++ARFLAGS=	cr
++LORDER=		echo
++TSORT=		cat
++
++RMDEP=		:
++MKDEP=		@echo "	==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
++MKDEP_OUT=
diff --git a/app-cdr/cdrdao/files/digest-cdrdao-1.1.9-r1 b/app-cdr/cdrdao/files/digest-cdrdao-1.1.9-r1
new file mode 100644
index 000000000000..9a277d7315a4
--- /dev/null
+++ b/app-cdr/cdrdao/files/digest-cdrdao-1.1.9-r1
@@ -0,0 +1 @@
+MD5 dd7df809fca7db8e212a6522688c166b cdrdao-1.1.9.tar.gz 1581717