Some cleanup

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

6 files changed, 39 insertions, 33 deletions

diff --git a/sci-chemistry/pdb-extract/ChangeLog b/sci-chemistry/pdb-extract/ChangeLog
index b9c98dda5f0e..de7d9d8a78c6 100644
--- a/sci-chemistry/pdb-extract/ChangeLog
+++ b/sci-chemistry/pdb-extract/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/pdb-extract
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb-extract/ChangeLog,v 1.16 2010/06/15 14:45:45 jlec Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb-extract/ChangeLog,v 1.17 2011/07/21 19:04:04 jlec Exp $
+
+  21 Jul 2011; Justin Lecher <jlec@gentoo.org> pdb-extract-1.700.ebuild,
+  pdb-extract-3.004-r1.ebuild, pdb-extract-3.004-r2.ebuild, metadata.xml:
+  Some cleanup
 
 *pdb-extract-3.004-r2 (15 Jun 2010)
 
diff --git a/sci-chemistry/pdb-extract/Manifest b/sci-chemistry/pdb-extract/Manifest
index ec5d0ffebddb..1d1514ad35e7 100644
--- a/sci-chemistry/pdb-extract/Manifest
+++ b/sci-chemistry/pdb-extract/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX pdb-extract-3.004-Makefile.patch 1530 RMD160 ba4b642e37c26643dd682288f16db6fa9178cd6d SHA1 d50fb483a835a0a2c98e8306050fbfa10bbc6ef8 SHA256 b1e30c706e90757c436617af595e1dd79e3eb79e3e7449ef64dee757ebb04db7
 AUX pdb-extract-3.004-cflags-install.patch 7218 RMD160 c596e67b38f4058d69fd0e9626450a57dcef629d SHA1 f6a86b03ed9797d60278ba9466f66d4b255c6789 SHA256 cac3cf50b6fbf21dd03e096a9c02f9b4280e46818307c9452c6b4f4e988ed206
@@ -8,15 +8,15 @@ AUX pdb-extract-3.004-gcc-4.3.patch 573 RMD160 a9d563b1834bf6293568793a1895026f5
 AUX respect-cflags-and-fix-install.patch 8415 RMD160 b1418278385f197db26a49be4bf1ad2bbed4b4c0 SHA1 93bd785a4683542716309d917335de7a9c3573d4 SHA256 ab44177b9a9e34573331aafeb112efa86154a0c1ee706930aa05c32c0eb1e58b
 DIST pdb-extract-v1.700-prod-src.tar.gz 9081548 RMD160 c565de9af1cea09ccf0bd59527191fc76a4b7aa1 SHA1 27eedd1d46e95e7006c90694e379bdcb4f20fd92 SHA256 b35d2bf5d7f96580782a3645ab288aec1be21926bf52969f4de74d4f514a471c
 DIST pdb-extract-v3.004-prod-src.tar.gz 942450 RMD160 3d5d46e668a52109678fdf59afbe664dac1643f9 SHA1 7b5d7ce200d33e68fa352cd3658e382bc37e9768 SHA256 58bef2aba4869cdd16a79ddc588da5596a2ccd1f5c925f300b63b6d8299bb953
-EBUILD pdb-extract-1.700.ebuild 1457 RMD160 367b396727c4543fc192844f0361ddfed990424a SHA1 f27617cae26aa6e24284de3cb496d807ba1272f8 SHA256 29e7b728dab5a47bba11eafb034c5d9fd4323660af4404782990879c85e538fb
-EBUILD pdb-extract-3.004-r1.ebuild 2411 RMD160 b2d4d1fd95a9a2987324f041c25a805d47ef089e SHA1 463290a5cedaa4408422d0df6b65da61f5ec6a9a SHA256 27dd8e808a152dc114688bd26d5f0cf52eb5022e66d3e0cb5625973fb46e49fb
-EBUILD pdb-extract-3.004-r2.ebuild 2112 RMD160 41f8bcd0e1e512cfa81a6f437be0a676d8bb08a2 SHA1 dab1c9378a9c02c471dd3d8be20656f0dfd2cc5c SHA256 32c9305057524034dd91fe53259d2e5e90faebb1faec4ed7f90996bcaa14abc1
-MISC ChangeLog 2638 RMD160 bcae71e225e682892460a4744f06409e35285520 SHA1 0c31d5645a45c5a7f86c18d047b5c82e922c9b0d SHA256 853812c9db9111b99b8631d05e22bbdafef893f7983e6c9658344d943a43dd59
-MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
+EBUILD pdb-extract-1.700.ebuild 1456 RMD160 06b11dbb0c91e4221d47994242ae0bb50776e300 SHA1 22685588041edf20a66c1a117cfb7b468849d278 SHA256 cbd03b0b7e6ae6d2edf53254b855b12169f56e92dac29cb6b293d71e458a72fc
+EBUILD pdb-extract-3.004-r1.ebuild 2354 RMD160 019c3f8cf60d9f2bb5f133e5d2f009376fc00c45 SHA1 6622b6b4afc699c11d8e2884e7454e25a6f66ba7 SHA256 d006c2e59e6e0bac7572df5d1c32903a81184a09b4c0cc0e9dda20a0d906d055
+EBUILD pdb-extract-3.004-r2.ebuild 2102 RMD160 d39cdfe9e9486c192ec3601aa0abbe788dccf2ec SHA1 ac229e2ead75e409a3ba73fb4fd98b5c9c4ee61c SHA256 f9cef846c08e7972dbcb00cd83349d80ad53369179b6fd7be33a9bf3fb118d90
+MISC ChangeLog 2801 RMD160 ddfb1ba93cf8f7b8b2529a9e26021521ecf4d605 SHA1 09a77c951565a6b8e6ef39356fceb7b8bed676dc SHA256 6fa38d3d60e84547baee0441b211df8dae9351418d35c219f25f99989b38c3aa
+MISC metadata.xml 167 RMD160 ea4003a55d6e2079381a540c441fc59cde29025a SHA1 3bc6dc4dd68f7de22828138e62aa117387b1765d SHA256 f313eeec4ebffac500b57a98a225e32c77489fc826a50494749b6cdeec28e3e8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkwXkh8ACgkQgAnW8HDreRYcKQCcDr/oOXby/1GQIfMLDUlP8bXC
-xdwAn0Pm3EFBG6oCjqJ60PfUmKMNHmxH
-=D2JH
+iEYEAREKAAYFAk4oeCoACgkQgAnW8HDreRYUxwCgkJ5LP8V/MbEKBwRLa6RUyJeP
+vr0An3inHlXbHPS2pF3qfblBYot/+TnQ
+=3WtG
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/pdb-extract/metadata.xml b/sci-chemistry/pdb-extract/metadata.xml
index 9ac9ffdb3a41..e42d0af60f42 100644
--- a/sci-chemistry/pdb-extract/metadata.xml
+++ b/sci-chemistry/pdb-extract/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-chemistry</herd>
+	<herd>sci-chemistry</herd>
 </pkgmetadata>
diff --git a/sci-chemistry/pdb-extract/pdb-extract-1.700.ebuild b/sci-chemistry/pdb-extract/pdb-extract-1.700.ebuild
index 0e20b9966052..0aa1036a20b2 100644
--- a/sci-chemistry/pdb-extract/pdb-extract-1.700.ebuild
+++ b/sci-chemistry/pdb-extract/pdb-extract-1.700.ebuild
@@ -1,21 +1,25 @@
-# Copyright 1999-2008 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/pdb-extract/pdb-extract-1.700.ebuild,v 1.6 2008/07/02 01:39:27 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb-extract/pdb-extract-1.700.ebuild,v 1.7 2011/07/21 19:04:04 jlec Exp $
 
 inherit eutils toolchain-funcs multilib
 
 MY_P="${PN}-v${PV}-prod-src"
+
 DESCRIPTION="Tools for extracting mmCIF data from structure determination applications"
 HOMEPAGE="http://sw-tools.pdb.org/apps/PDB_EXTRACT/index.html"
 SRC_URI="http://sw-tools.pdb.org/apps/PDB_EXTRACT/${MY_P}.tar.gz"
+
 LICENSE="PDB"
 SLOT="0"
 KEYWORDS="~amd64 ppc x86"
 IUSE=""
+
 RDEPEND=""
 DEPEND="${RDEPEND}
 	sci-libs/cifparse-obj"
 PDEPEND="sci-libs/rcsb-data"
+
 S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
diff --git a/sci-chemistry/pdb-extract/pdb-extract-3.004-r1.ebuild b/sci-chemistry/pdb-extract/pdb-extract-3.004-r1.ebuild
index 2748393fd723..471f70af534b 100644
--- a/sci-chemistry/pdb-extract/pdb-extract-3.004-r1.ebuild
+++ b/sci-chemistry/pdb-extract/pdb-extract-3.004-r1.ebuild
@@ -1,8 +1,8 @@
-# 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/pdb-extract/pdb-extract-3.004-r1.ebuild,v 1.1 2010/04/25 09:53:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb-extract/pdb-extract-3.004-r1.ebuild,v 1.2 2011/07/21 19:04:04 jlec Exp $
 
-EAPI="3"
+EAPI=3
 
 inherit eutils toolchain-funcs multilib prefix
 
@@ -24,10 +24,11 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-cflags-install.patch
-	epatch "${FILESDIR}"/${P}-gcc-4.3.patch
-	epatch "${FILESDIR}"/${P}-Makefile.patch
-	epatch "${FILESDIR}"/${P}-env.patch
+	epatch \
+		"${FILESDIR}"/${P}-cflags-install.patch \
+		"${FILESDIR}"/${P}-gcc-4.3.patch \
+		"${FILESDIR}"/${P}-Makefile.patch \
+		"${FILESDIR}"/${P}-env.patch
 
 	sed -i "s:GENTOOLIBDIR:$(get_libdir):g" \
 		pdb-extract-v3.0/Makefile \
@@ -50,10 +51,6 @@ src_prepare() {
 	eprefixify pdb-extract-v3.0/Makefile etc/*
 }
 
-src_compile() {
-	emake || die "make failed"
-}
-
 src_install() {
 	dobin bin/pdb_extract{,_sf} \
 		|| die "failed to install binaries"
diff --git a/sci-chemistry/pdb-extract/pdb-extract-3.004-r2.ebuild b/sci-chemistry/pdb-extract/pdb-extract-3.004-r2.ebuild
index 74c976e00fd8..de5bf3201034 100644
--- a/sci-chemistry/pdb-extract/pdb-extract-3.004-r2.ebuild
+++ b/sci-chemistry/pdb-extract/pdb-extract-3.004-r2.ebuild
@@ -1,8 +1,8 @@
-# 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/pdb-extract/pdb-extract-3.004-r2.ebuild,v 1.1 2010/06/15 14:45:45 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb-extract/pdb-extract-3.004-r2.ebuild,v 1.2 2011/07/21 19:04:04 jlec Exp $
 
-EAPI="3"
+EAPI=3
 
 inherit eutils toolchain-funcs multilib prefix
 
@@ -24,10 +24,11 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-cflags-install.patch
-	epatch "${FILESDIR}"/${P}-gcc-4.3.patch
-	epatch "${FILESDIR}"/${P}-Makefile.patch
-	epatch "${FILESDIR}"/${P}-env.patch
+	epatch \
+		"${FILESDIR}"/${P}-cflags-install.patch \
+		"${FILESDIR}"/${P}-gcc-4.3.patch \
+		"${FILESDIR}"/${P}-Makefile.patch \
+		"${FILESDIR}"/${P}-env.patch
 
 	sed -i "s:GENTOOLIBDIR:$(get_libdir):g" \
 		pdb-extract-v3.0/Makefile \