With patch from Ilya, allow using both cdrtools and cdrkit

Package-Manager: portage-2.1.10.39/cvs/Linux x86_64

4 files changed, 51 insertions, 19 deletions

diff --git a/media-video/bombono-dvd/ChangeLog b/media-video/bombono-dvd/ChangeLog
index d43e3e0d0fce..8a50a46a2a8b 100644
--- a/media-video/bombono-dvd/ChangeLog
+++ b/media-video/bombono-dvd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/bombono-dvd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/bombono-dvd/ChangeLog,v 1.19 2011/12/02 19:36:13 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/bombono-dvd/ChangeLog,v 1.20 2011/12/06 20:40:26 dilfridge Exp $
+
+*bombono-dvd-1.2.0-r1 (06 Dec 2011)
+
+  06 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -bombono-dvd-1.2.0.ebuild, +bombono-dvd-1.2.0-r1.ebuild,
+  +files/bombono-dvd-1.2.0-cdrtools.patch:
+  With patch from Ilya, allow using both cdrtools and cdrkit
 
   02 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   bombono-dvd-1.2.0.ebuild, metadata.xml:
diff --git a/media-video/bombono-dvd/Manifest b/media-video/bombono-dvd/Manifest
index 3ddb7d337e5f..f1832a374d1a 100644
--- a/media-video/bombono-dvd/Manifest
+++ b/media-video/bombono-dvd/Manifest
@@ -2,28 +2,29 @@
 Hash: SHA512
 
 AUX bombono-dvd-1.0.1-cflags.patch 404 RMD160 b4b5e7fa62cb38e259c308e74f2d987012415436 SHA1 221de9705bc55ba8f7c302e5aff7445c98b2eb37 SHA256 444670fc33219364ff6fa360f35d34ac4db9e5df89fca62b616f369fdf1b7a85
+AUX bombono-dvd-1.2.0-cdrtools.patch 864 RMD160 d91b366245161a3f632f02e4ffceb74251185dfb SHA1 37e75f082e0d48b4fe5f1f883819e8bf12df7f65 SHA256 48bc239848cfff2adff21a11f11d7690bc11a1fb6a4b1bdbef6fa2c2948c135b
 DIST bombono-dvd-1.0.0.tar.bz2 2513011 RMD160 74e36c8f6648de2a3576ab08d4d8802ca615d206 SHA1 6023ac09d92468578b83877c2e2290f51a4c3e79 SHA256 20d09039e6ded6be573a6def0ff27de51d0f31febd0451e41f8ae88d8da324d0
 DIST bombono-dvd-1.0.2.tar.bz2 2515568 RMD160 51b315ffeb106c844c916aaf9b6d4eab2436e8eb SHA1 b3a88775a0ca20c581a4e250f8d83efbc167cd49 SHA256 352fb23686e04c335392037d849cd6e7fe15690efdd96f12a06003175dd23c14
 DIST bombono-dvd-1.2.0.tar.bz2 4104588 RMD160 124616d5e2840b15569bce6f44ec5e4cd0519f09 SHA1 bb0c1d09124a3208c6f87c6db2d1e863385de08a SHA256 0bc6fbab5c1786754d6346eacb34bc11e430e1d6e42008cb1a4bb883601b2cc1
 EBUILD bombono-dvd-1.0.0.ebuild 1380 RMD160 c9a493be60349cea15c8e26526b85ff3109f7257 SHA1 91ed80ca0920e33ccf6fd1191528f770ea825c28 SHA256 0f91aa9c852b1b019ee3cc4d1e019935def55daaf651d48735fec2118fd23298
 EBUILD bombono-dvd-1.0.2.ebuild 1253 RMD160 e37d157b806840584d802965d815414edd03e003 SHA1 0949588189d3c954219eb1b84c19d26a955b7a3d SHA256 7b3c23a4e3bcb91ac0d11cef112c043207a2c548901e5d16964cde7e9580facd
-EBUILD bombono-dvd-1.2.0.ebuild 1346 RMD160 360179a6487f9f5f3264aab0de0d131662aadd5b SHA1 efaddc372b1cdfc35b9aa0664b01aaad6d64e1ea SHA256 f2ab7385153789df944e5b4f9ec896fd7e739734e23d9e520776cef55bfa17b6
-MISC ChangeLog 3918 RMD160 cc2aff909edcbad75e561ff4920ce3addcf7c576 SHA1 7874cf2bd8a8f76a1df7660aded5280a50d5f3b4 SHA256 4c173dce8f26d25250d79bbfe543cad00e3e4a1fc8167b0449b9f89a0cb85ac0
+EBUILD bombono-dvd-1.2.0-r1.ebuild 1394 RMD160 4b7ca9d4e927b743fc24a338c72b854a6109dd13 SHA1 f4a2c10de962cdb2dad718ae2456d636425bff06 SHA256 ddd412c86a7efde84a23e4b90bce905df415d0b9e4949cb61f3103f1e53895a3
+MISC ChangeLog 4176 RMD160 c65b77e8443e1703d7119b1be645043381016118 SHA1 23035d67296d3c8462c937cb497a654230ba2afc SHA256 222ad84c618038d56a139f624690edcb8b46d0e869ae009c072a4c0f5f197ef8
 MISC metadata.xml 316 RMD160 8b9ec18f9c8b7482ced9ffc80691954a51b207fd SHA1 04076bb20e7d6961cf2b9cdba049670f4feb62d0 SHA256 75918b600bc480f95cefc2a22804bf65e9ed2e114ee3c20df99ec18e689fa5ee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJO2Si0AAoJENwGBM22xffeu6YP/RJYEBFF+eji1LbgPuw2C/IE
-pTAiLpCRsHl1M4+sCN4luH69dcyHD6YEopSlB9rjqHegWOLZH0rYKEeFD+jfhMHE
-+TS5Pk5EHNOojrm1Af09LIASC6A+gAmumDODDascnAuMca5bl6xWLURRkH29JNs2
-vx6ZrUC3KQTfBpjwERbLGq2nwXwXLJGVGgNUnghj6ieeXb/Fq7Oq1sSKcGIgteot
-7Awgtk/GfzrPIy1/IjlZm51YqH4s6FKjUPxMJ2OnDQ5v81LYVDZCYTq6BKCyRBiy
-svjqHyV8psRi8+H//tamMWS/6VKDhgZ81WQk94SfUwZZ4zAehzOmm1g8TDMrgMCa
-KQDen0qDBlZs+aW7wTTOF6fQMc9DX9b8rsMc+Vln0zoZhl99eYljq98uY5JSTwe7
-rK16oqOOo8ddSvJvegUmS3jnvMMOIL7k/9q0Xm48aZYcrTeyzpJjEDZaWaR/K14/
-zT3VecVXs2E3nTauZB8WDdvmpfVk9NzSAhvUHglohmiOtG6qkserYvWADaXkj1GX
-+HTXwD55UDzF6D0J1QvRDzyrjEl8SQkX3oqUVoN5SuUyoW7AZQ0LgTrNp5EQmk93
-eh/FFmOJCbmjEltV0EOg+7ZYevmy4yHbWNvLcWK1uH2HkfF56u7e/AD+S1lSoDCS
-LXt+7XfROR6QeUt3o2Nw
-=0v0R
+iQIcBAEBCgAGBQJO3n3HAAoJENwGBM22xffemMYQAJaKfURknu5kwn+r2mWkE20u
+qu8uROc83qD9HBjLHlLwsTVI/OPmd1kqQqip543aoVn3JkzGCqlyYXiaHxsLmHLZ
+b3Yc+y10p6Hha28DpS/I4oZqH9FUOFISX6NKYEOTQVEXYRqSMh4Vqvg+YRIbdMdY
++hO0Fol4aedW1S1XafrkfuIK6C4CgC3ACp3/SvVsXGbZHZzLqYcOzeZ12Qp1+k+q
+CrvRCgNmKMtPfZaI6k40XNeF71liCedvfRXbDSjayKDOjodkQ66FUGKlea4qN4Rx
+0EheDIBi7qYrT3iyxYATkmuWmAQLfpCvHDzc1Q+A6wNpPSaUDtt7bGf+HIAXMLRM
+834SNKTCTKs1tseVtPqIVrFuKbkjGFuuCEIZGlYbn7JSkc3k06Q/yZtwvi3tPXeg
+Q0euTdEswPy5qt+60jVO4fa8iIAGwypcftu9eELWoj0QyBnlLaUZuufT1CrYq1aD
+N7tuUjoVSN6j00Fh4LTKzcmPgz8IZdnDmuacYzKKC/mig4pcISUcP/FPIkNuehXA
+Gp0AAD0x+TRB4j3cqUd6WaODvvhPP/fDNEtfQW5MPWvQLzzCWB3undhmDbVQXiVV
+3JH0fSIHP5UfGQyHiihkt49nPslYf3DTgXUpiwyG5kxx9w3mM1USs0d5La6Ag0yI
+X4hY4zQ6DRelfIQhoIDr
+=sHvg
 -----END PGP SIGNATURE-----
diff --git a/media-video/bombono-dvd/bombono-dvd-1.2.0.ebuild b/media-video/bombono-dvd/bombono-dvd-1.2.0-r1.ebuild
index 861e28b9c89a..1eeae731a0d8 100644
--- a/media-video/bombono-dvd/bombono-dvd-1.2.0.ebuild
+++ b/media-video/bombono-dvd/bombono-dvd-1.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/bombono-dvd/bombono-dvd-1.2.0.ebuild,v 1.2 2011/12/02 19:36:13 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/bombono-dvd/bombono-dvd-1.2.0-r1.ebuild,v 1.1 2011/12/06 20:40:26 dilfridge Exp $
 
 EAPI=4
 
@@ -18,7 +18,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE="gnome"
 
 COMMONDEPEND="
-	app-cdr/cdrkit
 	app-i18n/enca
 	app-cdr/dvd+rw-tools
 	dev-cpp/gtkmm:2.4
@@ -27,6 +26,7 @@ COMMONDEPEND="
 	media-libs/libdvdread
 	media-sound/twolame
 	media-video/dvdauthor
+	virtual/cdrtools
 	virtual/ffmpeg
 	>=media-video/mjpegtools-1.8.0
 	x11-libs/gtk+:2
@@ -38,7 +38,10 @@ DEPEND="${COMMONDEPEND}
 	>=dev-util/scons-0.96.1
 "
 
-PATCHES=( "${FILESDIR}/${PN}-1.0.1-cflags.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.1-cflags.patch"
+	"${FILESDIR}/${PN}-1.2.0-cdrtools.patch"
+)
 
 src_compile() {
 	append-flags -DBOOST_FILESYSTEM_VERSION=2
diff --git a/media-video/bombono-dvd/files/bombono-dvd-1.2.0-cdrtools.patch b/media-video/bombono-dvd/files/bombono-dvd-1.2.0-cdrtools.patch
new file mode 100644
index 000000000000..10ab179ffe85
--- /dev/null
+++ b/media-video/bombono-dvd/files/bombono-dvd-1.2.0-cdrtools.patch
@@ -0,0 +1,21 @@
+diff --git a/src/mgui/author/script.h b/src/mgui/author/script.h
+index fe80307..a96fb54 100644
+--- a/src/mgui/author/script.h
++++ b/src/mgui/author/script.h
+@@ -115,9 +115,14 @@ ExitData AsyncOFCall(const std::string& cmd, const std::string& out_dir, OutputF
+ // POSIX-народ бесповоротно ушел на cdrkit (genisoimage), но с Win32
+ // у cdrkit хреново (только cygwin, нет собранного с growisofs с cdrkit под Win32) => потому - "вилка"
+ #ifdef _WIN32
+-#define MK_ISO_CMD "mkisofs"
++    #define MK_ISO_CMD "mkisofs"
+ #else
+-#define MK_ISO_CMD "genisoimage"
++    #define USE_CDRTOOLS
++    #ifdef USE_CDRTOOLS
++        #define MK_ISO_CMD "mkisofs"
++    #else // !USE_CDRTOOLS
++        #define MK_ISO_CMD "genisoimage"
++    #endif // !USE_CDRTOOLS
+ #endif
+ 
+ #endif // #ifndef __MGUI_AUTHOR_SCRIPT_H__