Improve error messages; remove old

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

3 files changed, 8 insertions, 77 deletions

diff --git a/media-video/bombono-dvd/ChangeLog b/media-video/bombono-dvd/ChangeLog
index e4ac7ec1252f..6582d78bc295 100644
--- a/media-video/bombono-dvd/ChangeLog
+++ b/media-video/bombono-dvd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/bombono-dvd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/bombono-dvd/ChangeLog,v 1.25 2012/04/09 19:14:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/bombono-dvd/ChangeLog,v 1.26 2012/04/09 19:18:58 dilfridge Exp $
+
+  09 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  bombono-dvd-1.0.0.ebuild, -bombono-dvd-1.2.0-r2.ebuild:
+  Improve error messages; remove old
 
   09 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org>
   bombono-dvd-1.2.1.ebuild:
diff --git a/media-video/bombono-dvd/bombono-dvd-1.0.0.ebuild b/media-video/bombono-dvd/bombono-dvd-1.0.0.ebuild
index bc4e0f86b63a..00c8a1061b53 100644
--- a/media-video/bombono-dvd/bombono-dvd-1.0.0.ebuild
+++ b/media-video/bombono-dvd/bombono-dvd-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.0.0.ebuild,v 1.8 2012/02/25 23:03:46 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/bombono-dvd/bombono-dvd-1.0.0.ebuild,v 1.9 2012/04/09 19:18:58 dilfridge Exp $
 
 EAPI=2
 
@@ -45,9 +45,9 @@ src_compile() {
 	scons CC="$(tc-getCC)" CXX="$(tc-getCXX)" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 		LDFLAGS="${LDFLAGS}" ${sconsopts} DESTDIR="${D}" PREFIX="/usr" \
 		CPPFLAGS='-UBOOST_SYSTEM_NO_DEPRECATED' USE_EXT_BOOST=1 \
-		|| die 'Please add "${S}/config.opts" when filing bugs reports!'
+		|| die "Please add ${S}/config.opts when filing bugs reports!"
 }
 
 src_install() {
-	scons install || die 'Please add "${S}/config.opts" when filing bugs reports!'
+	scons install || die "Please add ${S}/config.opts when filing bugs reports!"
 }
diff --git a/media-video/bombono-dvd/bombono-dvd-1.2.0-r2.ebuild b/media-video/bombono-dvd/bombono-dvd-1.2.0-r2.ebuild
deleted file mode 100644
index d370f4d58b4e..000000000000
--- a/media-video/bombono-dvd/bombono-dvd-1.2.0-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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-r2.ebuild,v 1.2 2011/12/07 16:12:42 mr_bones_ Exp $
-
-EAPI=4
-SCONS_MIN_VERSION="0.96.1"
-
-inherit base scons-utils toolchain-funcs flag-o-matic virtualx
-
-DESCRIPTION="GUI DVD authoring program"
-HOMEPAGE="http://www.bombono.org/"
-SRC_URI="mirror://sourceforge/bombono/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="gnome"
-
-COMMONDEPEND="
-	app-i18n/enca
-	app-cdr/dvd+rw-tools
-	dev-cpp/gtkmm:2.4
-	dev-cpp/libxmlpp:2.6
-	>=dev-libs/boost-1.47
-	media-libs/libdvdread
-	media-sound/twolame
-	media-video/dvdauthor
-	virtual/cdrtools
-	virtual/ffmpeg
-	>=media-video/mjpegtools-1.8.0
-	x11-libs/gtk+:2
-"
-RDEPEND="${COMMONDEPEND}
-	gnome?	( gnome-base/gvfs )
-"
-DEPEND="${COMMONDEPEND}
-	dev-util/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.1-cflags.patch"
-	"${FILESDIR}/${PN}-1.2.0-cdrtools.patch"
-	"${FILESDIR}/${PN}-1.2.0-libav.patch"
-)
-
-src_configure() {
-	append-flags -DBOOST_SYSTEM_NO_DEPRECATED -DBOOST_FILESYSTEM_VERSION=2
-	myesconsargs=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		CFLAGS="${CFLAGS}"
-		CXXFLAGS="${CXXFLAGS}"
-		DESTDIR="${D}"
-		LDFLAGS="${LDFLAGS}"
-		USE_EXT_BOOST=1
-		PREFIX="${EPREFIX}/usr"
-	)
-}
-
-src_compile() {
-	nonfatal escons \
-		|| die 'Please add "${S}/config.opts" when filing bugs reports!'
-}
-
-src_test() {
-	VIRTUALX_COMMAND="escons TEST=1" virtualmake
-}
-
-src_install() {
-	nonfatal escons install || die 'Please add "${S}/config.opts" when filing bugs reports!'
-}