Add missing dependencies wrt #371235 by Piotr Szymaniak <lazy_bum@o2.pl>, add missing die, remove unnecessary messages and quotes. Drop old

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

4 files changed, 25 insertions, 74 deletions

diff --git a/sci-chemistry/prekin/ChangeLog b/sci-chemistry/prekin/ChangeLog
index e7076b32f71d..caa678d2b56c 100644
--- a/sci-chemistry/prekin/ChangeLog
+++ b/sci-chemistry/prekin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/prekin
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/prekin/ChangeLog,v 1.3 2010/10/10 21:28:36 ulm Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/prekin/ChangeLog,v 1.4 2011/06/12 10:10:35 xarthisius Exp $
+
+  12 Jun 2011; Kacper Kowalik <xarthisius@gentoo.org>
+  -prekin-6.51.081122.ebuild, prekin-6.51.081122-r1.ebuild:
+  Add missing dependencies wrt #371235 by Piotr Szymaniak <lazy_bum@o2.pl>, add
+  missing die, remove unnecessary messages and quotes. Drop old
 
   10 Oct 2010; Ulrich Mueller <ulm@gentoo.org> prekin-6.51.081122.ebuild,
   prekin-6.51.081122-r1.ebuild:
diff --git a/sci-chemistry/prekin/Manifest b/sci-chemistry/prekin/Manifest
index 9909f26497ee..b01779974d9a 100644
--- a/sci-chemistry/prekin/Manifest
+++ b/sci-chemistry/prekin/Manifest
@@ -4,14 +4,15 @@ Hash: SHA1
 AUX 6.51.081122-Makefile.patch 1456 RMD160 2274cc1f803bb38ea5d1cba0f28b583859e7520d SHA1 7fb4e5b1f8e33e211dced62b779e5c09034e5857 SHA256 7f1b2d39007683b4ecb391ec5bd711ca32115f361dcfc0aa05b25fe52817bb4c
 AUX 6.51.081122-overflow.patch 1156 RMD160 155e1c64d2518b506d60a7a6140e954f59096047 SHA1 4000cddc53555d63c723254d72f0297e6fc18f2d SHA256 987a530c35f34b25783ce1b4ce0094614f06e97ae8ed652324b8b8ea7f897259
 DIST prekin.6.51.081122.src.tgz 350756 RMD160 a48df8558ee98396492851b0f1b73723cb4b9559 SHA1 7b3c1da210c26fd9740ecba4de02e985efdbbe61 SHA256 74a771cd8be000df13ac908f23a2e945e8bd3590884c6bc6ccff75804cc0fb7a
-EBUILD prekin-6.51.081122-r1.ebuild 1209 RMD160 94ec737429a1902f616ee6c49735765f2bc15c04 SHA1 5e51f103303e296ce0ac7adfc6a045d5a033abb3 SHA256 df153110993cc1b6e5bf3defeb3826d7cb198998153864b08a887d43f5c0e560
-EBUILD prekin-6.51.081122.ebuild 1206 RMD160 dfe0c5fa24338f9ecac3a598b883c2b9c25a7244 SHA1 cbf76de21b0f142ac72adab3d7953d1b25a05503 SHA256 e3c9a4cacf130f1e4da724e2096904c107e9a6c6f4e6ab7946106652d0e58e0a
-MISC ChangeLog 738 RMD160 d8676625efd7755b0c9214b2ef3d0f83df517779 SHA1 2853ca64956ee96ace30ec065e5b301c3b1893af SHA256 7a22cf218c883620ec50e27c59291880b96f236ea896d403cf9b2678b617e86d
+EBUILD prekin-6.51.081122-r1.ebuild 1214 RMD160 97681b37ee1b964d4b29d135bb73a8c122dfad19 SHA1 504dff1bfe6d435de327550e094aaf8f3da6a825 SHA256 4a7b7a3e2606975ff8e24fb0c47a468f6fd90f04bf86aa0cf1f91730bd66e92f
+MISC ChangeLog 1004 RMD160 0f94c2dc8feb65cc77cd8a99f9f443c7c305f9c6 SHA1 81e8764fde4fa1675b83427235af139fc8dd96f6 SHA256 5bcfbacc8aa8cf78ca974ea0e15386234f92e9f117fbc0d5317ca2a971c40dc9
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkyyMHgACgkQOeoy/oIi7uxHvgCgxgT8S2L53P+Iv0SNYLM+0hSg
-ITMAnipsPUssOt61WcjOiWMExXaKQKRm
-=eKnk
+iJwEAQECAAYFAk30kKQACgkQIiMqcbOVdxSnMQP+L8mHiD3sP+WZ3E8q2X+E0wJl
+YSwXN2T0sGHZSbrwAGU2fBzqtsblL+xEcyInF1rK4Ngkw1/NIxLGcjtbJ1NK9Ee6
+TYNJYOrBJhDvfOHDJOV2bxz5GUdzQQAwC3NYSv3GzQz99i/OEM88SDY8VHU0Lz83
+/OuQoeAxzyhxWoM1Yck=
+=Nqv4
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild b/sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild
index f259d714e2fc..06b34fbec698 100644
--- a/sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild
+++ b/sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild
@@ -1,29 +1,30 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild,v 1.2 2010/10/10 21:28:36 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild,v 1.3 2011/06/12 10:10:35 xarthisius Exp $
 
 EAPI="2"
 
 inherit toolchain-funcs eutils multilib
 
-MY_P="${PN}.${PV}"
+MY_P=${PN}.${PV}
 
 DESCRIPTION="Prepares molecular kinemages (input files for Mage & KiNG) from PDB-format coordinate files"
 HOMEPAGE="http://kinemage.biochem.duke.edu/software/prekin.php"
-SRC_URI="http://kinemage.biochem.duke.edu/downloads/software/prekin/${MY_P}.src.tgz"
+SRC_URI="http://kinemage.biochem.duke.edu/downloads/software/${PN}/${MY_P}.src.tgz"
 
 LICENSE="richardson"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="X"
 
-RDEPEND="
+RDEPEND="x11-libs/libXext
+	x11-libs/libXmu
 	x11-libs/libX11
 	x11-libs/libXt
 	X? ( >=x11-libs/openmotif-2.3:0 )"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	epatch \
@@ -32,7 +33,7 @@ src_prepare() {
 	sed  \
 		-e 's:cc:$(CC):g' \
 		-e "s:GENTOOLIBDIR:$(get_libdir):g" \
-		"${S}"/Makefile.linux > Makefile
+		"${S}"/Makefile.linux > Makefile || die
 }
 
 src_compile() {
@@ -44,11 +45,9 @@ src_compile() {
 		mytarget="nogui"
 	fi
 
-	emake \
-		CC="$(tc-getCC)" \
-		${mytarget} || die "make failed"
+	emake CC="$(tc-getCC)" ${mytarget} || die
 }
 
 src_install() {
-	dobin "${S}"/prekin || die "dobin failed"
+	dobin "${S}"/prekin || die
 }
diff --git a/sci-chemistry/prekin/prekin-6.51.081122.ebuild b/sci-chemistry/prekin/prekin-6.51.081122.ebuild
deleted file mode 100644
index d64df43d7139..000000000000
--- a/sci-chemistry/prekin/prekin-6.51.081122.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/prekin/prekin-6.51.081122.ebuild,v 1.3 2010/10/10 21:28:36 ulm Exp $
-
-EAPI="2"
-
-inherit toolchain-funcs eutils multilib
-
-MY_P="${PN}.${PV}"
-
-DESCRIPTION="Prepares molecular kinemages (input files for Mage & KiNG) from PDB-format coordinate files"
-HOMEPAGE="http://kinemage.biochem.duke.edu/software/prekin.php"
-SRC_URI="http://kinemage.biochem.duke.edu/downloads/software/prekin/${MY_P}.src.tgz"
-
-LICENSE="richardson"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="X"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXt
-	X? ( >=x11-libs/openmotif-2.3:0 )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PV}-Makefile.patch \
-		"${FILESDIR}"/${PV}-overflow.patch
-	sed  \
-		-e 's:cc:$(CC):g' \
-		-e "s:GENTOOLIBDIR:$(get_libdir):g" \
-		"${S}"/Makefile.linux > Makefile
-}
-
-src_compile() {
-	local mytarget
-
-	if use X; then
-		mytarget="${PN}"
-	else
-		mytarget="nogui"
-	fi
-
-	emake \
-		CC="$(tc-getCC)" \
-		${mytarget} || die "make failed"
-}
-
-src_install() {
-	dobin "${S}"/prekin || die "dobin failed"
-}