Removed superfluous "|| die" instructions

Thanks genstef for pointing it out

svn path=/testing/; revision=124

8 files changed, 42 insertions, 42 deletions

diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index be7790c..fdb711c 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -18,10 +18,10 @@ DIST nxcompext-2.1.0-4.tar.gz 95995 RMD160 8c388a79f825351787d810797408c0ba693b3
 DIST nxdesktop-2.1.0-8.tar.gz 526529 RMD160 fe3f8f0e0b38ad963570fb741bac98e092cc861e SHA1 f115217b27aec3751c1d0e04fbf18a77d1b076a8 SHA256 3d6710693ad10dea97c3b5e3d7975e225680cef857485c723aa781d3fa6a9306
 DIST nxproxy-2.1.0-2.tar.gz 75843 RMD160 6b0711d8f95b178402fca99b046e597d82fe2e02 SHA1 6c206c44e626ef29b2edcb99494b917792252526 SHA256 30db34375cf6bab3d65317ff0a5e533eb31d5c1c9a47922717478902c62c0e7b
 DIST nxviewer-2.1.0-11.tar.gz 239141 RMD160 0057a569c4e6b1969158d08a5a8e0a48995a7f8b SHA1 bb2626478b24aa69855f39da65c89a528d37c89e SHA256 55386c51a1e0c08c8598040dc6dfe4a1ebd7ff06280fa94371a050b78607fdb1
-EBUILD nx-2.1.0.ebuild 3400 RMD160 22ffe7a695f59943ec0888c3f38cf01f363085b1 SHA1 c3d8ba7cd71e2eade124851bcce9c21cffb2a821 SHA256 43b810cfddad363c78ea260ffe14976adfada5ece57a2f747b73520106eea783
-MD5 626bf4ec6161b1a64898f0c91cdf4d51 nx-2.1.0.ebuild 3400
-RMD160 22ffe7a695f59943ec0888c3f38cf01f363085b1 nx-2.1.0.ebuild 3400
-SHA256 43b810cfddad363c78ea260ffe14976adfada5ece57a2f747b73520106eea783 nx-2.1.0.ebuild 3400
+EBUILD nx-2.1.0.ebuild 3332 RMD160 1f60019d5113574ec80360e82bd81fb39c4015ee SHA1 1663577b07b5c9d80a78d4b20634e9d3ae6a6471 SHA256 c6f3c3d54ace200dc4da49f47576d6ccac2c6a4a78dc9b0bc8337d753c220ac4
+MD5 335fb571a895f715d677e3b859110d14 nx-2.1.0.ebuild 3332
+RMD160 1f60019d5113574ec80360e82bd81fb39c4015ee nx-2.1.0.ebuild 3332
+SHA256 c6f3c3d54ace200dc4da49f47576d6ccac2c6a4a78dc9b0bc8337d753c220ac4 nx-2.1.0.ebuild 3332
 MD5 b83c623c71cbc341fae644a89282b44d files/digest-nx-2.1.0 1985
 RMD160 34e4e75a659854855b102b21b972cb2bf337f453 files/digest-nx-2.1.0 1985
 SHA256 6691e7f8d5652e63454aa58001acd03af8b2d6dd5be4844341cc41d74fb0253e files/digest-nx-2.1.0 1985
diff --git a/net-misc/nx/nx-2.1.0.ebuild b/net-misc/nx/nx-2.1.0.ebuild
index a33d058..2289d4e 100644
--- a/net-misc/nx/nx-2.1.0.ebuild
+++ b/net-misc/nx/nx-2.1.0.ebuild
@@ -118,22 +118,22 @@ src_install() {
 	fi
 
 	into /usr/lib/NX
-	dobin ${WORKDIR}/nx-X11/programs/Xserver/nxagent || die
-	dobin ${WORKDIR}/nx-X11/programs/nxauth/nxauth || die
-	dobin ${WORKDIR}/nxproxy/nxproxy || die
+	dobin ${WORKDIR}/nx-X11/programs/Xserver/nxagent
+	dobin ${WORKDIR}/nx-X11/programs/nxauth/nxauth
+	dobin ${WORKDIR}/nxproxy/nxproxy 
 
 	if use vnc ; then
-		dobin ${WORKDIR}/nxviewer/nxviewer/nxviewer || die
-		dobin ${WORKDIR}/nxviewer/nxpasswd/nxpasswd || die
+		dobin ${WORKDIR}/nxviewer/nxviewer/nxviewer 
+		dobin ${WORKDIR}/nxviewer/nxpasswd/nxpasswd 
 	fi
 
 	if use rdesktop ; then
-		dobin ${WORKDIR}/nxdesktop/nxdesktop || die
+		dobin ${WORKDIR}/nxdesktop/nxdesktop 
 	fi
 
-	dolib.so ${WORKDIR}/nx-X11/lib/X11/libX11.so* || die
-	dolib.so ${WORKDIR}/nx-X11/lib/Xext/libXext.so* || die
-	dolib.so ${WORKDIR}/nx-X11/lib/Xrender/libXrender.so* || die
-	dolib.so ${WORKDIR}/nxcomp/libXcomp.so* || die
-	dolib.so ${WORKDIR}/nxcompext/libXcompext.so* || die
+	dolib.so ${WORKDIR}/nx-X11/lib/X11/libX11.so* 
+	dolib.so ${WORKDIR}/nx-X11/lib/Xext/libXext.so* 
+	dolib.so ${WORKDIR}/nx-X11/lib/Xrender/libXrender.so* 
+	dolib.so ${WORKDIR}/nxcomp/libXcomp.so* 
+	dolib.so ${WORKDIR}/nxcompext/libXcompext.so* 
 }
diff --git a/net-misc/nxclient/Manifest b/net-misc/nxclient/Manifest
index 46d75ec..4edfd2c 100644
--- a/net-misc/nxclient/Manifest
+++ b/net-misc/nxclient/Manifest
@@ -1,8 +1,8 @@
 DIST nxclient-2.1.0-11.i386.tar.gz 3505596 RMD160 5e877f993621e655ef2ad0228717a156a815690b SHA1 dca34c63dbb2321de6802f83a4707cf11d657d90 SHA256 c114f1e125494fd0ad1c4ad8371bbd8b97f3c4b24f0c43ca09a2b68b8eb5fe1f
-EBUILD nxclient-2.1.0.ebuild 1832 RMD160 de244831038714a0775cb549cec0e521bc39ae5a SHA1 6bc7c55359b3c13ae11d98bd5544ae8cf4a88869 SHA256 6a74adbf2f922dafcb64b62f0c9ddbfb1252f1a0cff97ea5ce6b2de52d3c445e
-MD5 35ff9f5e4e64c58b011b7c5648c28305 nxclient-2.1.0.ebuild 1832
-RMD160 de244831038714a0775cb549cec0e521bc39ae5a nxclient-2.1.0.ebuild 1832
-SHA256 6a74adbf2f922dafcb64b62f0c9ddbfb1252f1a0cff97ea5ce6b2de52d3c445e nxclient-2.1.0.ebuild 1832
+EBUILD nxclient-2.1.0.ebuild 1825 RMD160 c657b969716314d268726b2e28691d56ec5bbd2c SHA1 7f9c821a8549a30e764289a178bc1cfc447ef201 SHA256 d139dc92f21ecba7300b463321ae7db003871fef00c715a6400cd8f608de97e3
+MD5 dd83654bea950537ed83dbe2963a2cf1 nxclient-2.1.0.ebuild 1825
+RMD160 c657b969716314d268726b2e28691d56ec5bbd2c nxclient-2.1.0.ebuild 1825
+SHA256 d139dc92f21ecba7300b463321ae7db003871fef00c715a6400cd8f608de97e3 nxclient-2.1.0.ebuild 1825
 MISC ChangeLog 5072 RMD160 117161023f9641b108332febc4ac657908e9702c SHA1 0c7f97a13fe107057b0ca11b021dba5937d080d6 SHA256 76d5e8085a09ec95da808305ef2ad44f523dfeb06470db6f833d15456f8988b9
 MD5 6965ed2278762f3aa2cd50c5510e906c ChangeLog 5072
 RMD160 117161023f9641b108332febc4ac657908e9702c ChangeLog 5072
diff --git a/net-misc/nxclient/nxclient-2.1.0.ebuild b/net-misc/nxclient/nxclient-2.1.0.ebuild
index 5e0a7ae..90cfbb2 100644
--- a/net-misc/nxclient/nxclient-2.1.0.ebuild
+++ b/net-misc/nxclient/nxclient-2.1.0.ebuild
@@ -48,7 +48,7 @@ src_install()
 
 	for x in nxclient nxesd nxkill nxprint nxservice nxssh ; do
 		into /usr/NX
-		dobin bin/$x || die
+		dobin bin/$x
 		into /usr
 		make_wrapper $x ./$x /usr/NX/bin /usr/NX/lib || die
 	done
diff --git a/net-misc/nxnode/Manifest b/net-misc/nxnode/Manifest
index 46e0a58..6469140 100644
--- a/net-misc/nxnode/Manifest
+++ b/net-misc/nxnode/Manifest
@@ -7,10 +7,10 @@ MD5 82a440e1c0f91809ad5cca32066b4fd0 files/nxnode-2.1.0-setup.patch 1357
 RMD160 f5af6e093ecdb45551b95b1d047065f5f3aa9b54 files/nxnode-2.1.0-setup.patch 1357
 SHA256 ee95f966f0598e966d2cef3d8fff0888ec7880afded8d275e2f415939b1508c3 files/nxnode-2.1.0-setup.patch 1357
 DIST nxnode-2.1.0-15.i386.tar.gz 5156679 RMD160 775ce55e6a7c17db5a22e50da30e0067522c227a SHA1 95d5867c22336ac05281ae2ad5db0c1845c3baef SHA256 eadcb79a5eba169b16fd83144f89a6167bd634fbf8b7860270864d88a493b76c
-EBUILD nxnode-2.1.0.ebuild 2582 RMD160 304432b5930386fce2ecad9938a6dd8d013f1a52 SHA1 157d528d878143aa024daa3cb37f9eeb9347957e SHA256 67dd5933e5c0c0eda6c00cc62d2ee80b5c25edf830d96afef5dfbc9fbff58a9e
-MD5 3cb016d89d07d6ce4e9709251aa146c1 nxnode-2.1.0.ebuild 2582
-RMD160 304432b5930386fce2ecad9938a6dd8d013f1a52 nxnode-2.1.0.ebuild 2582
-SHA256 67dd5933e5c0c0eda6c00cc62d2ee80b5c25edf830d96afef5dfbc9fbff58a9e nxnode-2.1.0.ebuild 2582
+EBUILD nxnode-2.1.0.ebuild 2562 RMD160 ae9b82589a08a3c686f354e40f8c79749dad1ff3 SHA1 eda2d62754b6dcb0cf9fb133c641dbfadbe9e80e SHA256 545f2c0dcb779120705446d2ce3287b1d65b4c96d0928a018f090b5e35c23e4c
+MD5 7685d8757a3284cee64643943d648068 nxnode-2.1.0.ebuild 2562
+RMD160 ae9b82589a08a3c686f354e40f8c79749dad1ff3 nxnode-2.1.0.ebuild 2562
+SHA256 545f2c0dcb779120705446d2ce3287b1d65b4c96d0928a018f090b5e35c23e4c nxnode-2.1.0.ebuild 2562
 MD5 d8cd09718b9bd0c3a7f4a943c5be33c3 files/digest-nxnode-2.1.0 265
 RMD160 b101a7c82855f101751e3285e5965cee005a982d files/digest-nxnode-2.1.0 265
 SHA256 e43eaae7b4538a03bf8e44deea5cd1a0ebe830a1ee3714f691bb7d0c06acd08e files/digest-nxnode-2.1.0 265
diff --git a/net-misc/nxnode/nxnode-2.1.0.ebuild b/net-misc/nxnode/nxnode-2.1.0.ebuild
index a48b22a..b70cd6d 100644
--- a/net-misc/nxnode/nxnode-2.1.0.ebuild
+++ b/net-misc/nxnode/nxnode-2.1.0.ebuild
@@ -54,7 +54,7 @@ src_install()
 
 	into /usr/NX
 	for x in nxagent nxdesktop nxnode nxpasswd nxsensor nxspool nxuexec nxviewer ; do
-		dobin bin/$x || die
+		dobin bin/$x 
 	done
 
 	dodir /usr/NX/etc
@@ -74,9 +74,9 @@ src_install()
 	dodir /usr/NX/var
 	cp -R var ${D}/usr/NX || die
 
-	dodir /etc/init.d || die
+	dodir /etc/init.d
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/nxnode-2.1.0-init nxsensor || die
+	newexe ${FILESDIR}/nxnode-2.1.0-init nxsensor
 }
 
 pkg_postinst()
diff --git a/net-misc/nxserver-freeedition/Manifest b/net-misc/nxserver-freeedition/Manifest
index 712db74..e51a004 100644
--- a/net-misc/nxserver-freeedition/Manifest
+++ b/net-misc/nxserver-freeedition/Manifest
@@ -7,10 +7,10 @@ MD5 acbc4350a1f1fbee7d4e1aed7755e197 files/nxserver-2.1.0-setup.patch 1927
 RMD160 e0ee56dedff3dac4265d6ca920b7534f6c097ce3 files/nxserver-2.1.0-setup.patch 1927
 SHA256 2c9c934897ea31cfe6a860ad86fb9bf8e0c4b0e3dbff6b1f5472d19755030d7d files/nxserver-2.1.0-setup.patch 1927
 DIST nxserver-2.1.0-18.i386.tar.gz 5121771 RMD160 0e11165c6e888276e0fc17c6987bbe412f0664bd SHA1 ef3d7761caa906688394cd9b81f624ef009b1b24 SHA256 c6c23ccebdc4746be62448110e136a42b570aebb2d97dae2bcd548305aef90bb
-EBUILD nxserver-freeedition-2.1.0.ebuild 1906 RMD160 526ef6dd84336e8a45186276983ec4aaa9397943 SHA1 239c98842b33d2f6f0ccbc2537383916bb8e0ca5 SHA256 75d8acb7091de441201f02e77a6eb3d1d05e5671ca2699b2fd5debe07dc225e1
-MD5 a6a3644bff036e741330b9c6394e05c8 nxserver-freeedition-2.1.0.ebuild 1906
-RMD160 526ef6dd84336e8a45186276983ec4aaa9397943 nxserver-freeedition-2.1.0.ebuild 1906
-SHA256 75d8acb7091de441201f02e77a6eb3d1d05e5671ca2699b2fd5debe07dc225e1 nxserver-freeedition-2.1.0.ebuild 1906
+EBUILD nxserver-freeedition-2.1.0.ebuild 1835 RMD160 8f2e183ff31a74457e1c75732cb97e49a44264d6 SHA1 392cdd89175a5aae96d19c9b29b87d7d93b71482 SHA256 decd1abba105205fb00c44dd7b387a70350422c41b68e657166d45a38b15bd2f
+MD5 946aa847d9c4dbec898da1939ba3e49a nxserver-freeedition-2.1.0.ebuild 1835
+RMD160 8f2e183ff31a74457e1c75732cb97e49a44264d6 nxserver-freeedition-2.1.0.ebuild 1835
+SHA256 decd1abba105205fb00c44dd7b387a70350422c41b68e657166d45a38b15bd2f nxserver-freeedition-2.1.0.ebuild 1835
 MD5 b4d7fbe4c8422570000376a91c37c856 files/digest-nxserver-freeedition-2.1.0 271
 RMD160 f2d854466da37098288228ecc049317c73bc85e9 files/digest-nxserver-freeedition-2.1.0 271
 SHA256 7bba96820f219e34f8566206ecfa8e3cae6be92b706bd218f729264d55086961 files/digest-nxserver-freeedition-2.1.0 271
diff --git a/net-misc/nxserver-freeedition/nxserver-freeedition-2.1.0.ebuild b/net-misc/nxserver-freeedition/nxserver-freeedition-2.1.0.ebuild
index 3c99693..f47fe57 100644
--- a/net-misc/nxserver-freeedition/nxserver-freeedition-2.1.0.ebuild
+++ b/net-misc/nxserver-freeedition/nxserver-freeedition-2.1.0.ebuild
@@ -22,14 +22,14 @@ S="${WORKDIR}/NX"
 
 pkg_preinst()
 {
-	enewuser nx -1 -1 /usr/NX/home/nx || die
+	enewuser nx -1 -1 /usr/NX/home/nx
 }
 
 src_unpack()
 {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/nxserver-2.1.0-setup.patch || die
+	epatch ${FILESDIR}/nxserver-2.1.0-setup.patch
 }
 
 src_install()
@@ -41,19 +41,19 @@ src_install()
 
 	into /usr/NX
 	for x in nxserver ; do
-		dobin bin/$x || die
+		dobin bin/$x
 	done
 
 	dodir /usr/NX/etc
 	insinto /usr/NX/etc
-	doins etc/administrators.db.sample || die
-	doins etc/guests.db.sample || die
-	doins etc/passwords.db.sample || die
-	doins etc/profiles.db.sample || die
-	doins etc/users.db.sample || die
-	doins etc/server.lic.sample || die
+	doins etc/administrators.db.sample
+	doins etc/guests.db.sample 
+	doins etc/passwords.db.sample 
+	doins etc/profiles.db.sample 
+	doins etc/users.db.sample 
+	doins etc/server.lic.sample 
 
-	newins etc/server-debian.cfg.sample server-gentoo.cfg.sample || die
+	newins etc/server-debian.cfg.sample server-gentoo.cfg.sample 
 
 	cp -R etc/keys ${D}/usr/NX/etc || die
 
@@ -64,7 +64,7 @@ src_install()
 	cp -R var ${D}/usr/NX || die
 
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/nxserver-2.1.0-init nxserver || die
+	newexe ${FILESDIR}/nxserver-2.1.0-init nxserver
 }
 
 pkg_postinst ()