Removed subshelled 'die' found by qualudis.

Package-Manager: portage-2.1.2_pre2-r1

diff --git a/app-cdr/dvdshrink/ChangeLog b/app-cdr/dvdshrink/ChangeLog
index fe8575451f6cc28077108a7708fa85fcc2384ad4..d80981944a18b33ea5d19759570111be8b78bfa7 100644 (file)
--- a/app-cdr/dvdshrink/ChangeLog
+++ b/app-cdr/dvdshrink/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/dvdshrink
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvdshrink/ChangeLog,v 1.8 2006/10/28 12:41:45 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvdshrink/ChangeLog,v 1.9 2006/12/17 23:19:17 kugelfang Exp $
+
+  17 Dec 2006; Danny van Dyk <kugelfang@gentoo.org>
+  dvdshrink-2.6.1-r1.ebuild, dvdshrink-2.6.1_p8.ebuild:
+  Removed subshelled 'die' found by qualudis.
 
 *dvdshrink-2.6.1_p8 (28 Oct 2006)
 

diff --git a/app-cdr/dvdshrink/Manifest b/app-cdr/dvdshrink/Manifest
index 5435754e0e1e45a9b9fcdeec08ccf5fec7e15355..c7e0ac69834928f41f914fa5ce8126bfd27aea93 100644 (file)
--- a/app-cdr/dvdshrink/Manifest
+++ b/app-cdr/dvdshrink/Manifest
@@ -1,17 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST dvdshrink-2.6.1-6mdk.tar.gz 1087369 RMD160 d2cd29cb16c583c375d76e4dd686748797097198 SHA1 d8ab2d20e584064a56b8ffc5e5404b39d0ae5a0c SHA256 6046c3c966a9cd8a2f62594b036298238d1edb05a85f8b2012c08f0b98bf1693
 DIST dvdshrink-2.6.1-8mdk.tar.gz 1087395 RMD160 1d08b4ac54d5e9aa03a5085262fafef98db67573 SHA1 b288258596c4948df0f2d022c8fa45da9cdb6c8b SHA256 fa44e008c31db644b85b342af70187d77a308261d6e33882c49a98c6518dfcb4
-EBUILD dvdshrink-2.6.1-r1.ebuild 1773 RMD160 f2bacd6aea800da4a1af45fd2e58379bfe088e41 SHA1 d5294ac19a41d5bff3321866c2077d97988d6cc8 SHA256 819782ec75ccd28799cd2287c7974bc81cd46b2dd3301777c213e04f68409502
-MD5 9aa2b021f5e5e84483c61f66175dbb6d dvdshrink-2.6.1-r1.ebuild 1773
-RMD160 f2bacd6aea800da4a1af45fd2e58379bfe088e41 dvdshrink-2.6.1-r1.ebuild 1773
-SHA256 819782ec75ccd28799cd2287c7974bc81cd46b2dd3301777c213e04f68409502 dvdshrink-2.6.1-r1.ebuild 1773
-EBUILD dvdshrink-2.6.1_p8.ebuild 1776 RMD160 36ad45fac28b09884917179dddc6a1f9d811e268 SHA1 09c48ba8563c3661ab1ae411329dd44905aeadc8 SHA256 e6085fa0cd147a5dae4aa2307b0395503b1bd4fb296ca650eb46f31ce720b9a7
-MD5 cf40810cb3d476010c39429021285afc dvdshrink-2.6.1_p8.ebuild 1776
-RMD160 36ad45fac28b09884917179dddc6a1f9d811e268 dvdshrink-2.6.1_p8.ebuild 1776
-SHA256 e6085fa0cd147a5dae4aa2307b0395503b1bd4fb296ca650eb46f31ce720b9a7 dvdshrink-2.6.1_p8.ebuild 1776
-MISC ChangeLog 1480 RMD160 63e0ada215abe30601910c685559e359f1942fdd SHA1 342a983fdbc229cf0bc844960604ea6760d52b54 SHA256 dbe97c9f42023202ff1929dd077acd7b6395cbdc327f09968285337cf54ca6f1
-MD5 5125b33636b45636a58d5e464495bad4 ChangeLog 1480
-RMD160 63e0ada215abe30601910c685559e359f1942fdd ChangeLog 1480
-SHA256 dbe97c9f42023202ff1929dd077acd7b6395cbdc327f09968285337cf54ca6f1 ChangeLog 1480
+EBUILD dvdshrink-2.6.1-r1.ebuild 1786 RMD160 09dc0fd5d88c5bc87b69bcdcc5f4363259025b20 SHA1 bf806a3d2214c940a094c775b69ca4090f14352f SHA256 4f13fecd528bbf3fa03a819c4e897259555300a518f5361a093d85ebceca229b
+MD5 e8ddc469f7b01e1d86c2c95f34d20ec9 dvdshrink-2.6.1-r1.ebuild 1786
+RMD160 09dc0fd5d88c5bc87b69bcdcc5f4363259025b20 dvdshrink-2.6.1-r1.ebuild 1786
+SHA256 4f13fecd528bbf3fa03a819c4e897259555300a518f5361a093d85ebceca229b dvdshrink-2.6.1-r1.ebuild 1786
+EBUILD dvdshrink-2.6.1_p8.ebuild 1789 RMD160 f623ee439694d39a9fdbcb563770a8952096c747 SHA1 c8f05f4a267482ebc5ad379ff349f6e6d09749f7 SHA256 b07d17b33a33ec9f88bc8b2128566670533b3d04f9124eff622e3cab242d2dca
+MD5 cf70b0013e1cb1a99df279bac7bfadad dvdshrink-2.6.1_p8.ebuild 1789
+RMD160 f623ee439694d39a9fdbcb563770a8952096c747 dvdshrink-2.6.1_p8.ebuild 1789
+SHA256 b07d17b33a33ec9f88bc8b2128566670533b3d04f9124eff622e3cab242d2dca dvdshrink-2.6.1_p8.ebuild 1789
+MISC ChangeLog 1639 RMD160 8e5d09ea9fed3c5471e84d048ba5e05f6b0e395c SHA1 f75fd1ef500c64e8e20c3851cbc1620d1b625045 SHA256 b768241c11ef7f2da8e9aad0adfc87bdfd948ba2855035a2a163251b1545a815
+MD5 abc08b58910947f0d3444429cd19cf1c ChangeLog 1639
+RMD160 8e5d09ea9fed3c5471e84d048ba5e05f6b0e395c ChangeLog 1639
+SHA256 b768241c11ef7f2da8e9aad0adfc87bdfd948ba2855035a2a163251b1545a815 ChangeLog 1639
 MISC metadata.xml 346 RMD160 cbfefd095df606e393bc1df9035c90038143c488 SHA1 e0299bb255563bbf627a8cca0d44ffe5a93829ed SHA256 96230e127ecb7e1472216733c7c88c170d06794d7119bc789e7046da8d8eebfa
 MD5 7b0a4927654b9fb3d0c5b9771bce028b metadata.xml 346
 RMD160 cbfefd095df606e393bc1df9035c90038143c488 metadata.xml 346
@@ -22,3 +25,10 @@ SHA256 a1895ecdb9d2f833fbac957834c0c1fa1b657312f97b29bd7b8c57ff89179b10 files/di
 MD5 5d8a80dc64817c052a69eb8a3a7ce720 files/digest-dvdshrink-2.6.1_p8 265
 RMD160 24ef525ab4a70012a449c47dfd17703587b1022f files/digest-dvdshrink-2.6.1_p8 265
 SHA256 032a990da9da81c4644579a9a8114e97e47c14cb367eb52356dd4af2bfafd6fe files/digest-dvdshrink-2.6.1_p8 265
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFFhdDP5mJXAu5GbtIRAoqYAJoDIURc+Ly5PUA+EjvulIGZGsV3EQCfbde6
+aIEclZQb1myx04+DwZ/Krpc=
+=LW1h
+-----END PGP SIGNATURE-----

diff --git a/app-cdr/dvdshrink/dvdshrink-2.6.1-r1.ebuild b/app-cdr/dvdshrink/dvdshrink-2.6.1-r1.ebuild
index 6653e880f6711c7a18ea9c5fcf0e5e10e0b6533e..20ccd49faba6cde5ace7c12fe782b0ac43d2f03e 100644 (file)
--- a/app-cdr/dvdshrink/dvdshrink-2.6.1-r1.ebuild
+++ b/app-cdr/dvdshrink/dvdshrink-2.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvdshrink/dvdshrink-2.6.1-r1.ebuild,v 1.4 2006/10/28 11:38:47 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvdshrink/dvdshrink-2.6.1-r1.ebuild,v 1.5 2006/12/17 23:19:17 kugelfang Exp $
 
 inherit eutils
 
@@ -35,7 +35,9 @@ pkg_setup() {
 src_install() {
 
        dobin ./usr/bin/dvdshrink || die "Install of dvdshrink failed"
-       use X && ( dobin ./usr/bin/xdvdshrink.pl || die "Install of xdvdshrink.pl failed" )
+       if use X ; then
+               dobin ./usr/bin/xdvdshrink.pl || die "Install of xdvdshrink.pl failed"
+       fi
 
        dobin ./usr/bin/dvdsfunctions || die "Install of dvdsfunctions failed"
        dobin ./usr/bin/batchrip.sh || die "Install of batchrip.sh failed"

diff --git a/app-cdr/dvdshrink/dvdshrink-2.6.1_p8.ebuild b/app-cdr/dvdshrink/dvdshrink-2.6.1_p8.ebuild
index eaa923a3ee015891553b1a10b745efc6f0d5e3f8..808a005d103ef62afda537164057f69f139718ed 100644 (file)
--- a/app-cdr/dvdshrink/dvdshrink-2.6.1_p8.ebuild
+++ b/app-cdr/dvdshrink/dvdshrink-2.6.1_p8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvdshrink/dvdshrink-2.6.1_p8.ebuild,v 1.1 2006/10/28 12:41:45 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvdshrink/dvdshrink-2.6.1_p8.ebuild,v 1.2 2006/12/17 23:19:17 kugelfang Exp $
 
 inherit eutils
 
@@ -35,7 +35,9 @@ pkg_setup() {
 src_install() {
 
        dobin ./usr/bin/dvdshrink || die "Install of dvdshrink failed"
-       use X && ( dobin ./usr/bin/xdvdshrink.pl || die "Install of xdvdshrink.pl failed" )
+       if use X ; then
+               dobin ./usr/bin/xdvdshrink.pl || die "Install of xdvdshrink.pl failed"
+       fi
 
        dobin ./usr/bin/dvdsfunctions || die "Install of dvdsfunctions failed"
        dobin ./usr/bin/batchrip.sh || die "Install of batchrip.sh failed"