app-cdr/cdrdao: fix build failure with libsigc++ 2.2

Package-Manager: portage-2.1.4.4

4 files changed, 92 insertions, 3 deletions

diff --git a/app-cdr/cdrdao/ChangeLog b/app-cdr/cdrdao/ChangeLog
index 426734f2158e..1e9ea263d049 100644
--- a/app-cdr/cdrdao/ChangeLog
+++ b/app-cdr/cdrdao/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/cdrdao
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.105 2007/11/14 19:27:22 drac Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.106 2008/03/15 09:45:48 remi Exp $
+
+*cdrdao-1.2.2-r1 (15 Mar 2008)
+
+  15 Mar 2008; Rémi Cardona <remi@gentoo.org>
+  +files/cdrdao-1.2.2-use-new-sigc++-API.patch, +cdrdao-1.2.2-r1.ebuild:
+  fix build failure with libsigc++ 2.2
 
   14 Nov 2007; Samuli Suominen <drac@gentoo.org> cdrdao-1.2.2.ebuild:
   amd64 stable wrt #193991
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
index fd32d1a11cfd..93368b6e4df2 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -1,11 +1,13 @@
 AUX cdrdao-1.2.0-gcc4.patch 869 RMD160 4b8baf7677640ff035705eef04bc0df27e0c07eb SHA1 d70d532a6e958744f5b98efc8ba156e895c75f55 SHA256 2b87b7c9b971d2a253caa76ae89b061c35394aacd004e5c0199c1a16fd821215
 AUX cdrdao-1.2.1-gcc41.patch 421 RMD160 374d62319984001921f03d89ab22c736f874190e SHA1 702ba18a2d62c4166af051364ef46a933d3dec7d SHA256 bb546f4a8060a188afb346af0f34894d03afc29d4874f3b561a17211ffd4dbd5
 AUX cdrdao-1.2.2-nonlinux.patch 380 RMD160 d58247e7faeb12b3bf416845f41aa9a77aa6d1ef SHA1 955a6e56e3264e773241d89ac0fd603ba5bcff31 SHA256 e15d0d3302272e958d8d5df705cd4146653aff2a55b5b582f04e70814cab7cd3
+AUX cdrdao-1.2.2-use-new-sigc++-API.patch 481 RMD160 48f39ef4b6f9db81a00b6fbbe6b44c0f0cd49a5b SHA1 092bd7a492026d5dd47e9c2ff9e2b2acf3f8a3bc SHA256 3d0159dfa815c92f82d16407977fe875f005224d28ccc00238a73df2474bba63
 AUX gcdmaster.desktop 127 RMD160 565c477fb1e8b937b97ce4767c2343741e22a425 SHA1 9d8b154482860ca49686e47f850c64b0628633b2 SHA256 2cd560f369ae9b40e4c63c099c851290809493df8d8be50deec592dcecb5005d
 DIST cdrdao-1.2.1.tar.gz 1728003 RMD160 4f6cabd016af69746db6d31d58ec0a7f49c38fde SHA1 530725bd0ed29eeda97eb5fcedbf7b4b44f4e863 SHA256 740dda4c4e88754d4a5997cd5130b4569dfcb0c9123ba6acaed3c266ac998162
 DIST cdrdao-1.2.2.tar.bz2 1408344 RMD160 c537c535a4106655f89f7cfa5895ffcb5b9464e2 SHA1 2699e56e00342c1fa2a3815ed02418fe964b276b SHA256 de180041e57f8e1c88c9b6f9b6c51b0abf0dc2744c4fa37a0248d48f40e58038
 EBUILD cdrdao-1.2.1-r1.ebuild 1673 RMD160 d7c17430f7230b2f5e12af913c82ad9d1a48a38c SHA1 0b48cac9d5907cec6f179cd82b953d4ffed718dc SHA256 d3452eb637cfcbb938819589ab5480e509d83877c7d14accc14e451b986107d6
 EBUILD cdrdao-1.2.1.ebuild 1551 RMD160 267398a684c3acfd13a90ee5a676c3d6fcc060a2 SHA1 836385c495296769e1475eff142aa2240e53cce2 SHA256 8c908639ea692c83fad34671ee7d13355561290a86c4b09f0bde33a041423ef3
+EBUILD cdrdao-1.2.2-r1.ebuild 1858 RMD160 5afa009321986af248541f7ce11886335196c7f2 SHA1 26c99fbcb5a6e5b7a48132992209a4a49618e30e SHA256 e3dddbde989333b00612cf40e65b6ed62b1935ae8ad6e983586b6988751f2791
 EBUILD cdrdao-1.2.2.ebuild 1768 RMD160 c09f8368a94aad488b1a99d27b01618f720e0c9d SHA1 1781d9936192c1f6a15e8cda2e9c9e387e2c5978 SHA256 a2c5d0972a78a72746f84010b8035ad1317c82c3a674e3af5011e9114126bb86
-MISC ChangeLog 14190 RMD160 38a0b51b638e555249a434011c93ec8e62fd7fc0 SHA1 5e68d31c8cb7153f735fb105ec01ac57c93f1418 SHA256 dbf4122abef04dcfff6fb9d9baa4c70fdf63716f466ad5d6316bc0f2d948227c
+MISC ChangeLog 14382 RMD160 13cbc919d55ab567cb47be3ae24ecbba0d75eef4 SHA1 0a87cd4fc3fc60b19d5d3a68b20e43921f136ba3 SHA256 11475bc8ff97bced684561a4ca7c836b78f2b9babae9e087dd44c706fddbc0c7
 MISC metadata.xml 319 RMD160 54559b717de30245b4e3369d398d0d4b8786cb94 SHA1 37ad6871b8179ee4180b374c9a4693253aa0bdc0 SHA256 449cdb691234e9d248959657370e866690fa998b7652124e8af2065447b042ea
diff --git a/app-cdr/cdrdao/cdrdao-1.2.2-r1.ebuild b/app-cdr/cdrdao/cdrdao-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..9b3ba8cc417c
--- /dev/null
+++ b/app-cdr/cdrdao/cdrdao-1.2.2-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.2.2-r1.ebuild,v 1.1 2008/03/15 09:45:48 remi 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}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="gnome debug encode pccts"
+RESTRICT="strip"
+
+RDEPEND="encode? ( >=media-sound/lame-3.90 )
+	gnome? ( >=dev-cpp/gtkmm-2.4
+		>=dev-cpp/libgnomemm-2.6
+		>=dev-cpp/libgnomecanvasmm-2.6
+		>=dev-cpp/gconfmm-2.6
+		>=dev-cpp/libgnomeuimm-2.6
+		media-libs/libao )"
+DEPEND="pccts? ( >=dev-util/pccts-1.33.24-r1 )
+	virtual/cdrtools
+	${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# fixes bug #212530
+	epatch "${FILESDIR}/${PN}-1.2.2-use-new-sigc++-API.patch"
+
+	# FreeBSD needs this patch
+	# I think the correct define should be linux, but this will maintain
+	# the status quo for the time being.
+	# Upstream bug #1596097
+	epatch "${FILESDIR}/${P}"-nonlinux.patch
+
+	# 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
+}
+
+src_compile() {
+	# A few CFLAGS do not work see bug #99998
+	strip-flags
+	append-flags "-fno-inline"
+
+	econf \
+		$(use_enable debug) \
+		$(use_with gnome xdao) \
+		$(use_with encode lame) \
+		$(use_with pccts pcctsbin /usr/bin) \
+		$(use_with pccts pcctsinc /usr/include/pccts) \
+		--disable-dependency-tracking || die "configure failed"
+
+	make || die "could not compile"
+}
+
+src_install() {
+	einstall || die "could not install"
+
+	cd "${S}"
+
+	dodoc AUTHORS CREDITS ChangeLog NEWS README*
+}
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.2-use-new-sigc++-API.patch b/app-cdr/cdrdao/files/cdrdao-1.2.2-use-new-sigc++-API.patch
new file mode 100644
index 000000000000..12731c0777b0
--- /dev/null
+++ b/app-cdr/cdrdao/files/cdrdao-1.2.2-use-new-sigc++-API.patch
@@ -0,0 +1,12 @@
+http://cdrdao.cvs.sourceforge.net/cdrdao/cdrdao/xdao/xcdrdao.cc?r1=1.30&r2=1.31&view=patch
+--- xdao/xcdrdao.cc	2007/08/15 14:24:49	1.30
++++ xdao/xcdrdao.cc	2007/09/11 08:58:42	1.31
+@@ -144,7 +144,7 @@
+   installSignalHandler(SIGCHLD, signalHandler);
+ 
+   // setup periodic GUI updates
+-  Glib::signal_timeout().connect(SigC::slot(&guiUpdatePeriodic), 2000);
++  Glib::signal_timeout().connect(sigc::ptr_fun(&guiUpdatePeriodic), 2000);
+ 
+   installSignalHandler(SIGPIPE, SIG_IGN);
+