Some cleanup

(Portage version: 2.2.0_alpha46/cvs/Linux x86_64)

5 files changed, 29 insertions, 23 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/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 \