ppc stable wrt #373091, drop old

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

3 files changed, 7 insertions, 75 deletions

diff --git a/sci-chemistry/molmol/ChangeLog b/sci-chemistry/molmol/ChangeLog
index 8f99378b1bd6..a9f038fc79c5 100644
--- a/sci-chemistry/molmol/ChangeLog
+++ b/sci-chemistry/molmol/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/molmol
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/ChangeLog,v 1.27 2011/09/14 21:25:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/ChangeLog,v 1.28 2011/10/15 09:11:00 xarthisius Exp $
+
+  15 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org> -molmol-2k_p2.ebuild,
+  molmol-2k_p2-r2.ebuild:
+  ppc stable wrt #373091, drop old
 
   14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> +files/libpng15.patch,
   molmol-2k_p2-r2.ebuild:
diff --git a/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild
index cef6add6ea62..61ee7552c8e6 100644
--- a/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild
+++ b/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild,v 1.8 2011/09/14 21:25:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild,v 1.9 2011/10/15 09:11:00 xarthisius Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="molmol"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="
diff --git a/sci-chemistry/molmol/molmol-2k_p2.ebuild b/sci-chemistry/molmol/molmol-2k_p2.ebuild
deleted file mode 100644
index e5d5a45f5636..000000000000
--- a/sci-chemistry/molmol/molmol-2k_p2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/molmol-2k_p2.ebuild,v 1.16 2011/06/26 08:21:31 jlec Exp $
-
-EAPI=2
-
-inherit eutils multilib toolchain-funcs
-
-MY_PV="${PV/_p/.}.0"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Publication-quality molecular visualization package"
-HOMEPAGE="http://hugin.ethz.ch/wuthrich/software/molmol/index.html"
-SRC_URI="
-	ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/${MY_P}-src.tar.gz
-	ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/${MY_P}-doc.tar.gz"
-
-LICENSE="molmol"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-DEPEND="
-	media-libs/mesa[motif]
-	media-libs/libpng
-	media-libs/tiff
-	sys-libs/zlib
-	virtual/jpeg
-	x11-libs/libXpm
-	>=x11-libs/openmotif-2.3:0"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-MMDIR="/usr/$(get_libdir)/molmol"
-
-src_prepare() {
-	# Patch from http://pjf.net/science/molmol.html, where src.rpm is provided
-	epatch "${FILESDIR}"/pjf_RH9_molmol2k2.diff
-
-	ln -s makedef.lnx "${S}"/makedef
-
-	# 1) The Korn shell is only taken by default because the Bourne shell
-	# on DEC systems cannot handle the script.
-	# We don't want this needless dependency.
-	# 2) Fix up MOLMOLHOME, which determines the directory the binary's in.
-	sed -i \
-		-e "s:/bin/ksh:/bin/sh:" \
-		-e "s:^MOLMOLHOME.*:MOLMOLHOME=${MMDIR}:" \
-		"${S}"/molmol
-	# 1) Set CFLAGS.
-	# 2) Set compiler.
-	sed -i \
-		-e "s:^MCFLAGS.*:MCFLAGS = ${CFLAGS}:" \
-		-e "s:^CC.*:CC = $(tc-getCC):" \
-		"${S}"/makedef
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	dobin molmol || die
-
-	exeinto ${MMDIR}
-	newexe src/main/molmol molmol.lnx || die
-	insinto ${MMDIR}
-	doins -r auxil help macros man setup tips || die
-
-	dodoc HISTORY README || die
-}