Improve error messages; remove old

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 23 insertions, 94 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/Manifest b/media-video/bombono-dvd/Manifest
index de469f1b4f1c..9bbde7e6b335 100644
--- a/media-video/bombono-dvd/Manifest
+++ b/media-video/bombono-dvd/Manifest
@@ -6,27 +6,25 @@ AUX bombono-dvd-1.0.1-cflags.patch 404 RMD160 b4b5e7fa62cb38e259c308e74f2d987012
 AUX bombono-dvd-1.2.0-cdrtools.patch 864 RMD160 d91b366245161a3f632f02e4ffceb74251185dfb SHA1 37e75f082e0d48b4fe5f1f883819e8bf12df7f65 SHA256 48bc239848cfff2adff21a11f11d7690bc11a1fb6a4b1bdbef6fa2c2948c135b
 AUX bombono-dvd-1.2.0-libav.patch 2581 RMD160 84c7ed5626c8e543e181598291d20a8e9fbef3a4 SHA1 f1323ccd48ab2f432e2e46e075d5b994fd7ea9d9 SHA256 0448a67d6071a3e643dafdefc9fa259292ced25b0f1d67f9e2bc6a3f2cd5ec41
 DIST bombono-dvd-1.0.0.tar.bz2 2513011 RMD160 74e36c8f6648de2a3576ab08d4d8802ca615d206 SHA1 6023ac09d92468578b83877c2e2290f51a4c3e79 SHA256 20d09039e6ded6be573a6def0ff27de51d0f31febd0451e41f8ae88d8da324d0
-DIST bombono-dvd-1.2.0.tar.bz2 4104588 RMD160 124616d5e2840b15569bce6f44ec5e4cd0519f09 SHA1 bb0c1d09124a3208c6f87c6db2d1e863385de08a SHA256 0bc6fbab5c1786754d6346eacb34bc11e430e1d6e42008cb1a4bb883601b2cc1
 DIST bombono-dvd-1.2.1.tar.bz2 4111237 RMD160 38c2c0cdbfb229c1d254a426168bbf91026496f4 SHA1 c00d49a596e7f40744239225d23b1fdcc27a630f SHA256 89817ce134b5ee2879285dfb30e9f8b0603b2282989ecb91793e7b928d64152f
-EBUILD bombono-dvd-1.0.0.ebuild 1435 RMD160 0e17a2ca4caa3542380d130c971fe36fe74aff3e SHA1 36e576de3ce8cb675b98aeadc6f57ebd688a6c81 SHA256 66b4ea88dfe46966ae0fc36d0e84a9f6760f216d4f275795e66f813fd1b492d4
-EBUILD bombono-dvd-1.2.0-r2.ebuild 1589 RMD160 b20c3e9f1459070781894d28625889fbfbdeb0a5 SHA1 79eb358fabd85cf822cb1bba440760112fee08e1 SHA256 95eb2931fdb962f9c35f90a113ed36c3344e35b9fd7f89a72a757907478275e9
+EBUILD bombono-dvd-1.0.0.ebuild 1432 RMD160 25c2b8c84984a3ff1de7f2552eaae119fd17d30a SHA1 779e622eeb13f7a4937d19e793200e0926c020b0 SHA256 30c40f8591524cd7f8b5ed3aefe6f189cab8f4112d3ec0d04d13561d5d6423ec
 EBUILD bombono-dvd-1.2.1.ebuild 1543 RMD160 c96fbccc7cc5a1a22fa380c8c49cfaa39e6501e5 SHA1 1207ffd385250f21489b6adf1d6595d08316b8af SHA256 c79e2f279794aa8240b244b3b3be72c2621a3df2871dd107e14f70fbe8ce1c42
-MISC ChangeLog 5071 RMD160 dd8ca3ac7b62d970887097142858e6582c002649 SHA1 aa49d672261f2b5f18098db93ece58bd1a4a4d27 SHA256 158780f13244af1ca97113b8ab6f9abe6a4c6315cfa851780a8bb2c668f4e1a0
+MISC ChangeLog 5224 RMD160 31705f4258fc5edacd7f9fc3ed94b07cdba3bc19 SHA1 1152bba6d9e9db81b38cffe637d2f5f05aa2e76c SHA256 2f8cce9aea8ba37ca745c07e112f7f88de9cf3fa4e13dbef1dd9c00fbed92c75
 MISC metadata.xml 316 RMD160 8b9ec18f9c8b7482ced9ffc80691954a51b207fd SHA1 04076bb20e7d6961cf2b9cdba049670f4feb62d0 SHA256 75918b600bc480f95cefc2a22804bf65e9ed2e114ee3c20df99ec18e689fa5ee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPgzUMAAoJENwGBM22xffejFwP/ieIKt7cYlDKTEUjtlg4JgML
-36Gm2zw0e5h5kf3J8sQvn82hTgK2mExdZ4AwII5Epv4bA5eR4KLOmYTms3IComnt
-2Eywuii0vSDb6KPs8IN665j/x51w3vXnwuMas8NE438PaPmzulNOAWlz2HM68pJS
-IEGV6e3P/rFk7okSb4B8KIPEbVgRTC68Xx0nPllu1Aum4h+S8MzY46/vk1y02wdo
-8F77L4YnP/OCpY+aVYsSwH7b4Qaa32qVYzfpHrZcdWC7LRg3zUKpBduZKFCv4rPI
-u+4vTyNLadiH2UalQTrHx9Mreo4Gki6qCNpDTWe8fqYjhgYi0f7r0IJRt9N8DKUm
-LzqYZLVGcMGnl+zNA5X48RjAb7IunfyV6aPtDI3nKbl8NgYTFubEmOHSbqstOWPz
-4rX1skJTGVILFOmsba5fZOiwNfMaL+zvrTQGB3OZr87einYiVJQ7NLj9EtFeDF4+
-OSZiVxLYwlQ9gM+k1CPlZa+cwe5dSqRi4ewIeZNvchkK/oUFEBHxhSyfoVusnGVe
-UAlomHkNIIBIeB/i0evQdlmD3ZmzQI2dDBIoU9IRy/aH6YJDwjgfUK891XLKJDUy
-I8epYcn1mFK/p4Mt07hTKKefq5cQQypf2hBUZvMB2cg7DL2i83qb7IzgjQ5zyKPj
-qpddVi6ARt7DPjdnrZ/g
-=hFFl
+iQIcBAEBCgAGBQJPgzYuAAoJENwGBM22xffek9EP/i6A1+Ik7yTp1BjU6ZqzHL/K
+6vTwQQkNSCL+4jGkcMHYHsHu3sNLjZq0mTfCRXzQUMfbsnKR/TTTxkdBEfgizNq7
+H4dQE+l8jibjv/Knpq/g35VilUY/2e1eiQMxB6n3fshoC5u7KtGO8fqB6+Z93xo1
+TAvnoQ2Ueb6GG3kvlpRJBHGRY8HvqmIaNjSYbl8ffnw0gyRliufjNXWWU48RDVbq
+QzwlqqhqDJ1IacivN7JUBe8kdoGOWXlHgdBCqZKnQP8u9vaw+fbzqyaBNABl9DZ5
+UQVfW7dDP25H1Dd0GJo+wstobullLH4gQLnZDLsJ8L5Y0YY9babLbIzEnshOIadn
+IOg9A7ra0XLfM7/StL5hRFtUSoiXPiMk7jqZQuKWX0S7WO3zKvToMEIskKlDPvnM
+UOVBWXpKEbi1F2wilUvHW6VdGwWkuA7GlCU1FAas2sHRYWcSeW9QTKQkUdc1sju/
+RxAgLbSS3pLvfXQf4lMm+SoC0OFbxLgKs/3hTyRJeMimeVgKUj49m3WDRvhtA2jk
+LoH3Xj47n9binveQJ4F9xpxexAqvR89eVIZYcNar62y5oOJ32RDrs+KyjmMGP0tR
+I9ImJv6YBNfLdmJ3K60BPlq2bfaqzBMryHwKFsqartbIzDVjjP+7U5M1dcIVJnXT
+1DWBF/rvUmB11UbdK/Ml
+=qB7A
 -----END PGP SIGNATURE-----
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!'
-}