Add '-gentoo' to version, so that k3b, etc can detect that we have a special

version that includes scglib support.

5 files changed, 155 insertions, 4 deletions

diff --git a/app-cdr/cdrdao/ChangeLog b/app-cdr/cdrdao/ChangeLog
index 7924f3ea65ac..036cf45ed654 100644
--- a/app-cdr/cdrdao/ChangeLog
+++ b/app-cdr/cdrdao/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-cdr/cdrdao
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.24 2003/11/29 05:06:55 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.25 2003/12/16 22:03:01 azarah Exp $
+
+*cdrdao-1.1.7-r3 (16 Dec 2003)
+
+  16 Dec 2003; Martin Schlemmer <azarah@gentoo.org> cdrdao-1.1.7-r3.ebuild,
+  files/cdrdao-1.1.7-gentoo-version.patch:
+  Add '-gentoo' to version, so that k3b, etc can detect that we have a special
+  version that includes scglib support.
 
   29 Nov 2003; Brad House <brad_mssw@gentoo.org> cdrdao-1.1.7-r2.ebuild:
   mark stable on amd64
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
index ad53ab5aa326..6d44f861f915 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -1,12 +1,12 @@
 MD5 3f60abf919bc2d3996cee6389ec70b51 cdrdao-1.1.7-r1.ebuild 2498
 MD5 9945c13d43819d7f1f712389dba3ac0d cdrdao-1.1.7.ebuild 1941
-MD5 667856ebea79f420a6ccab5812896282 ChangeLog 3336
+MD5 40876cfae3cd0a8985e8dccfecaffe84 ChangeLog 3604
 MD5 df57ef8725ba1a35553f00ae1f40fdda cdrdao-1.1.5-r1.ebuild 2603
 MD5 6b2203c1b89fd2ac20dab8e814d265ee cdrdao-1.1.7-r2.ebuild 2748
-MD5 598e5aebcc2e3bf88d19cf38c4f2dd48 cdrdao-1.1.7-r3.ebuild 2913
+MD5 c63ccc40a56ec00a16103403c6ca5918 cdrdao-1.1.7-r3.ebuild 2919
 MD5 e21496bf5b1e2efcd09be0b16241b165 files/digest-cdrdao-1.1.7-r2 69
 MD5 e21496bf5b1e2efcd09be0b16241b165 files/digest-cdrdao-1.1.7-r3 69
-MD5 b7fa72239b015ec9718500db5646b2bf files/cdrdao-1.1.7-gentoo-version.patch 754
+MD5 46fb619628173aa68a337e7d49dd25b6 files/cdrdao-1.1.7-gentoo-version.patch 753
 MD5 e21496bf5b1e2efcd09be0b16241b165 files/digest-cdrdao-1.1.7-r1 69
 MD5 a7dc4823c3a7d7582f9b87afdddb51e0 files/cdrdao-1.1.7-r1-mp32dao-gentoo.diff 779
 MD5 e21496bf5b1e2efcd09be0b16241b165 files/digest-cdrdao-1.1.7 69
diff --git a/app-cdr/cdrdao/cdrdao-1.1.7-r3.ebuild b/app-cdr/cdrdao/cdrdao-1.1.7-r3.ebuild
new file mode 100644
index 000000000000..1b3a62dbaab7
--- /dev/null
+++ b/app-cdr/cdrdao/cdrdao-1.1.7-r3.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.7-r3.ebuild,v 1.1 2003/12/16 22:03:01 azarah Exp $
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
+HOMEPAGE="http://cdrdao.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cdrdao/${P}.src.tar.gz"
+RESTRICT="nomirror"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+IUSE="gnome oggvorbis perl"
+
+RDEPEND="gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1
+	>=dev-cpp/gnomemm-1.2.2 )
+	x86? ( perl? ( oggvorbis? ( dev-perl/libvorbis-perl ) ) )
+	dev-perl/MP3-Info
+	dev-perl/Audio-Wav
+	dev-perl/Audio-Tools
+	virtual/cdrtools
+	>=sys-apps/sed-4"
+DEPEND=">=dev-util/pccts-1.33.24-r1
+	${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-r2-mp32dao-gentoo.diff
+
+	if [ ! "`use oggvorbis`" ]; then
+		cd ${S}/contrib/mp32dao
+		sed -i '22s/^/#/' MediaHandler.pm
+	fi
+
+	if [ "${ARCH}" = "hppa" ]
+	then
+		cd ${S}/scsilib/RULES
+		for i in parisc parisc64
+		do
+			cp i386-linux-cc.rul $i-linux-cc.rul
+			cp i386-linux-gcc.rul $i-linux-gcc.rul
+		done
+	fi
+
+	# Add '-gentoo' to version, so that k3b, etc can detect that we have
+	# a special version that includes scglib support.
+	epatch ${FILESDIR}/${P}-gentoo-version.patch
+}
+
+src_compile() {
+	local mygnome=
+
+	if [ "`use gnome`" ] ; then
+		mygnome=" --with-gnome"
+		append-flags "$( /usr/bin/gtkmm-config --cflags ) -fno-exceptions"
+	fi
+	# -funroll-loops do not work
+	filter-flags "-funroll-loops"
+
+	./configure "${mygnome}" \
+		--prefix=/usr \
+		--build="${CHOST}"\
+		--host="${CHOST}" \
+		--with-scglib-inc=/usr/include/scsilib \
+		--with-scglib-lib=/usr/lib \
+		|| die "configure failed"
+	emake || die
+}
+
+src_install() {
+	# mp32dao.pl
+	dobin contrib/mp32dao/mp32dao.pl
+	insinto /usr/share/cdrdao/mp32dao
+	doins contrib/mp32dao/MediaHandler.pm contrib/mp32dao/mp3handler.pm \
+		contrib/mp32dao/BaseInfo.pm
+	use oggvorbis && doins contrib/mp32dao/ogghandler.pm
+
+	# cdrdao gets definitely installed
+	# binary
+	dobin dao/cdrdao
+
+	# data of cdrdao in /usr/share/cdrdao/
+	# (right now only driverlist)
+	insinto /usr/share/cdrdao
+	newins dao/cdrdao.drivers drivers
+
+	# man page
+	into /usr
+	newman dao/cdrdao.man cdrdao.1
+
+	# documentation
+	docinto ""
+	dodoc COPYING CREDITS INSTALL README* Release*
+
+	# and now the optional GNOME frontend
+	if [ "`use gnome`" ] ; then
+		# binary
+		into /usr
+		dobin xdao/gcdmaster
+
+		# pixmaps for gcdmaster in /usr/share/pixmaps/gcdmaster
+		insinto /usr/share/pixmaps/gcdmaster
+		doins xdao/*.png xdao/*.xpm
+
+		# application links
+		# gcdmaster.desktop in /usr/share/gnome/apps/Applications
+		insinto /usr/share/gnome/apps/Applications
+		doins xdao/gcdmaster.desktop
+
+		# xcdrdao.1 renamed to gcdmaster.1 in /usr/share/man/man1/
+		into /usr
+		newman xdao/xcdrdao.man gcdmaster.1
+	fi
+}
diff --git a/app-cdr/cdrdao/files/cdrdao-1.1.7-gentoo-version.patch b/app-cdr/cdrdao/files/cdrdao-1.1.7-gentoo-version.patch
new file mode 100644
index 000000000000..d716cbee202f
--- /dev/null
+++ b/app-cdr/cdrdao/files/cdrdao-1.1.7-gentoo-version.patch
@@ -0,0 +1,24 @@
+diff -urN cdrdao-1.1.7/configure cdrdao-1.1.7.az/configure
+--- cdrdao-1.1.7/configure	2002-10-06 20:53:55.000000000 +0200
++++ cdrdao-1.1.7.az/configure	2003-12-16 20:46:10.293799472 +0200
+@@ -998,7 +998,7 @@
+ PATH_SEPARATOR="$ac_path_separator"
+ rm -f conftest.sh
+ 
+-cdrdao_version=1.1.7
++cdrdao_version=1.1.7-gentoo
+ 
+ ac_config_headers="$ac_config_headers config.h"
+ 
+diff -urN cdrdao-1.1.7/configure.in cdrdao-1.1.7.az/configure.in
+--- cdrdao-1.1.7/configure.in	2002-10-06 20:53:55.000000000 +0200
++++ cdrdao-1.1.7.az/configure.in	2003-12-16 20:46:19.002475552 +0200
+@@ -2,7 +2,7 @@
+ AC_REVISION($Revision: 1.1 $)dnl
+ AC_INIT(cdrdao.lsm)
+ 
+-cdrdao_version=1.1.7
++cdrdao_version=1.1.7-gentoo
+ 
+ AC_CONFIG_HEADER(config.h)
+ AC_CONFIG_SUBDIRS(paranoia)
diff --git a/app-cdr/cdrdao/files/digest-cdrdao-1.1.7-r3 b/app-cdr/cdrdao/files/digest-cdrdao-1.1.7-r3
new file mode 100644
index 000000000000..3d4e147be05c
--- /dev/null
+++ b/app-cdr/cdrdao/files/digest-cdrdao-1.1.7-r3
@@ -0,0 +1 @@
+MD5 766a534137f2c6e99ab771e3178793f8 cdrdao-1.1.7.src.tar.gz 1433366