[media-video/bombono-dvd] Version bump. Drop integrated patch. Honour LDFLAGS.

svn path=/sunrise/; revision=11193

3 files changed, 10 insertions, 56 deletions

diff --git a/media-video/bombono-dvd/ChangeLog b/media-video/bombono-dvd/ChangeLog
index c78488dde..209cbd9d8 100644
--- a/media-video/bombono-dvd/ChangeLog
+++ b/media-video/bombono-dvd/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*bombono-dvd-0.6.0 (22 Aug 2010)
+
+  22 Aug 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
+  -bombono-dvd-0.5.2.ebuild, -files/bombono-dvd-0.5.2-twolame.patch,
+  +bombono-dvd-0.6.0.ebuild:
+  Version bump. Drop integrated patch. Honour LDFLAGS.
+
   04 Jan 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
   bombono-dvd-0.5.2.ebuild:
   Improved handling of non-standard MAKEOPTS
diff --git a/media-video/bombono-dvd/bombono-dvd-0.5.2.ebuild b/media-video/bombono-dvd/bombono-dvd-0.6.0.ebuild
index 84b517efe..7b20b9151 100644
--- a/media-video/bombono-dvd/bombono-dvd-0.5.2.ebuild
+++ b/media-video/bombono-dvd/bombono-dvd-0.6.0.ebuild
@@ -12,7 +12,9 @@ SRC_URI="mirror://sourceforge/bombono/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
+
 KEYWORDS="~amd64"
+
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.8
@@ -28,14 +30,12 @@ RDEPEND=">=x11-libs/gtk+-2.8
 DEPEND=">=dev-util/scons-0.96.1
 	${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-twolame.patch" )
-
 src_compile() {
 	# scons options differ from make options -> remove everything except "-jX" and "-j X"
 	local sconsopts=$(echo "${MAKEOPTS}" | sed -ne "/-j/ { s/.*\(-j[[:space:]]*[0-9]\+\).*/\1/; p }")
 
 	scons CC="$(tc-getCC)" CXX="$(tc-getCXX)" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-		${sconsopts} DESTDIR="${D}" PREFIX="/usr" \
+		LDFLAGS="${LDFLAGS}" ${sconsopts} DESTDIR="${D}" PREFIX="/usr" \
 		|| die 'Please add "${S}/config.opts" when filing bugs reports!'
 }
 
diff --git a/media-video/bombono-dvd/files/bombono-dvd-0.5.2-twolame.patch b/media-video/bombono-dvd/files/bombono-dvd-0.5.2-twolame.patch
deleted file mode 100644
index 9b44bc770..000000000
--- a/media-video/bombono-dvd/files/bombono-dvd-0.5.2-twolame.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -Naur bombono-dvd-0.5.2.orig/debian/control bombono-dvd-0.5.2/debian/control
---- bombono-dvd-0.5.2.orig/debian/control	2009-11-01 22:04:07.000000000 +0300
-+++ bombono-dvd-0.5.2/debian/control	2009-10-30 10:19:25.000000000 +0300
-@@ -8,7 +8,7 @@
- 
- Package: bombono-dvd
- Architecture: any
--Depends: ${shlibs:Depends}, ${misc:Depends}, dvdauthor, mjpegtools, dvd+rw-tools, scons, toolame
-+Depends: ${shlibs:Depends}, ${misc:Depends}, dvdauthor, mjpegtools, dvd+rw-tools, scons, twolame
- Suggests: totem
- Description: DVD authoring program with nice and clean GUI
-  Bombono DVD is easy to use program for making DVD-Video.
-diff -Naur bombono-dvd-0.5.2.orig/resources/scons_authoring/SConstruct bombono-dvd-0.5.2/resources/scons_authoring/SConstruct
---- bombono-dvd-0.5.2.orig/resources/scons_authoring/SConstruct	2009-11-01 22:04:07.000000000 +0300
-+++ bombono-dvd-0.5.2/resources/scons_authoring/SConstruct	2009-10-28 13:08:34.000000000 +0300
-@@ -16,23 +16,10 @@
- 
- # звук тишины для неподвижных меню
- def GetkHzArgForToolame(kHz):
--    import os
--    import re
--    #s = "tooLAME version 0.2l"
--    s = os.popen("toolame -v").read()
--    #print s
--
--    m = re.compile("tooLAME version 0\.2(.)", re.M).search(s)
--
--    res = kHz
--    if m and m.group(1) == 'l':
--        pass # classic toolame
--    else:
--        res = res * 1000 # twolame or similar
--    return res
-+    return kHz * 1000
- 
- argHz = GetkHzArgForToolame(48)
--Command('Silent.mp2', [], "dd if=/dev/zero bs=4 count=1920 | toolame -b 128 -s %d /dev/stdin $TARGET" % argHz)
-+Command('Silent.mp2', [], "dd if=/dev/zero bs=4 count=1920 | twolame -b 128 -s %d -r - $TARGET" % argHz)
- 
- # основная функция создания меню
- import ADVD
-diff -Naur bombono-dvd-0.5.2.orig/tools/scripts/bombono-dvd.spec bombono-dvd-0.5.2/tools/scripts/bombono-dvd.spec
---- bombono-dvd-0.5.2.orig/tools/scripts/bombono-dvd.spec	2009-10-08 13:25:07.000000000 +0400
-+++ bombono-dvd-0.5.2/tools/scripts/bombono-dvd.spec	2009-11-01 22:06:40.000000000 +0300
-@@ -16,7 +16,7 @@
- Packager:	Ilya Murav'jov <muravev@yandex.ru>
- Source:		%{name}-%{version}.tar.bz2
- BuildRequires:	scons libdvdread-devel gtkmm2-devel libxml++-devel mjpegtools-devel libGraphicsMagick++-devel
--Requires:       dvdauthor mjpegtools dvd+rw-tools scons toolame
-+Requires:       dvdauthor mjpegtools dvd+rw-tools scons twolame
- BuildRoot:	%{_tmppath}/%{name}-%{version}-build
- 
- # :TODO: