ppc stable wrt #373091, drop old

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

4 files changed, 14 insertions, 81 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/Manifest b/sci-chemistry/molmol/Manifest
index 0ff15a4f9ccd..31fac6cf7a87 100644
--- a/sci-chemistry/molmol/Manifest
+++ b/sci-chemistry/molmol/Manifest
@@ -8,14 +8,15 @@ AUX pjf_RH9_molmol2k2.diff 3138 RMD160 1792aa433a21c2f64880b244d11b6bbd2552c95b
 AUX prefix.patch 513 RMD160 23239041256a23c6223daab56e1aa59b5e911afa SHA1 5f3707fec532b15579020b5f21112d3fa2d41924 SHA256 efcb5d3fa7258cf88f02b63d1df3100eb0b73848c0ebabb59c84cb9ea082d8e7
 DIST molmol-2k.2.0-doc.tar.gz 1062297 RMD160 08b3e21ab6eb7c9044e59373334181ff91ca8a53 SHA1 b47551283fa19f57f4d5edcbd52f725055d80b7f SHA256 07e1c3fd04ffe7c9e9d91eaefa0bf72e6d0913a981eec3bf0879bfc65537a6be
 DIST molmol-2k.2.0-src.tar.gz 1088805 RMD160 b1de89953631dd9b11928751d7853cb511bf45f0 SHA1 09482a1dea601563ca64e773dc0ec47019e22c63 SHA256 1104dcb1b2517581c7d6b1695ff2e92f4076ad34afc48dd896eec38e5acf2287
-EBUILD molmol-2k_p2-r2.ebuild 1733 RMD160 aedb9a05ce3211c1bd00d3608e13f4ce164d0424 SHA1 62a1d255d2341e0b7e80ffb393c0140f29b7bed4 SHA256 59e78559b92aff7273050e216f069a1d01bca662237ec403f82cdbe2cee450f5
-EBUILD molmol-2k_p2.ebuild 1785 RMD160 361413e938f036cdf086089868baf99f7cda049b SHA1 315909e6d899e283e1459cf0b481e1ce53c7ab5b SHA256 8bf7de3885cb1ca21895acda65de02b330576bbf799ee535047582c0bbd61986
-MISC ChangeLog 3829 RMD160 074a34482468d6c6856c9cb2fd6630a537d9b82c SHA1 9f404c8dbdf9c8e15f6af08d93352d33c50d7914 SHA256 4caecdcf46ff09801ef3d8fc958417e2ec7536308968efcbb65431fad9589d5a
+EBUILD molmol-2k_p2-r2.ebuild 1733 RMD160 b469343a782c296098db2bc66003271eef2cf633 SHA1 e3981fa37f90268c6d3f32dda788aad870ecf21c SHA256 cdb54451273f2dee7f8e97588ab892838b7414d692767b8a73c404b879d9a3c0
+MISC ChangeLog 3968 RMD160 184702a7feb2f76c7a6d92dbfa859ae6da204e2d SHA1 4f95c329e4d1f43e4fe265ed84d53780b5537c12 SHA256 1e2c79ad8b815dab01b131c92ba4e2feb498a3c122b490f7e26af28cf7060150
 MISC metadata.xml 167 RMD160 ea4003a55d6e2079381a540c441fc59cde29025a SHA1 3bc6dc4dd68f7de22828138e62aa117387b1765d SHA256 f313eeec4ebffac500b57a98a225e32c77489fc826a50494749b6cdeec28e3e8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk5xG+gACgkQXkR9YqOcLPHnQQD/QIPdCY+h7Tqe8ATsPc58meGp
-mkNPbzNi2DuwHoUru88A/AsDWs+Aqo1vFxdrymfICb5E39NmEXGEUoENVohSHJf2
-=AWnm
+iJwEAQEIAAYFAk6ZTisACgkQIiMqcbOVdxSJWgP+N2v5BzLTWNgV4frDBplnDnk0
+twkUK5Et2hfPFDqUZIz5IK9KpIp8MPm8OR4kqYP7buIt2VwR7wDqMpLoFQNFm3Xa
+s2HL43Js8c2NcWqxTwkavAfSGTpOaeAYMsIV5egXnidTeKN7nGwA4cIuv8wuRADQ
+je5gn6iPjHzACJMwxDI=
+=iRO8
 -----END PGP SIGNATURE-----
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
-}