Drop old

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

4 files changed, 28 insertions, 88 deletions

diff --git a/sci-chemistry/molscript/ChangeLog b/sci-chemistry/molscript/ChangeLog
index 0bfca045f58a..c83296a81a63 100644
--- a/sci-chemistry/molscript/ChangeLog
+++ b/sci-chemistry/molscript/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/molscript
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molscript/ChangeLog,v 1.20 2015/05/27 11:22:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molscript/ChangeLog,v 1.21 2015/05/28 06:15:27 jlec Exp $
+
+  28 May 2015; Justin Lecher <jlec@gentoo.org> -molscript-2.1.2-r1.ebuild,
+  molscript-2.1.2-r2.ebuild:
+  Drop old
 
   27 May 2015; Agostino Sarubbo <ago@gentoo.org> molscript-2.1.2-r2.ebuild:
   Stable for x86, wrt bug #540370
diff --git a/sci-chemistry/molscript/Manifest b/sci-chemistry/molscript/Manifest
index b7f0fc838c49..a56074263ff4 100644
--- a/sci-chemistry/molscript/Manifest
+++ b/sci-chemistry/molscript/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 2.1.2-ldflags.patch 818 SHA256 ef1f4079d7b11d69f8f9835266b7bf066fa74623ef2e34c1a5638125153771ab SHA512 0e14bbf2869357e19360a977941995f8610cf2c5c4fe272a30480725350705f4d8dfa83541b1eca441c78079ca926a6449d488854d3b6b7ee1c84e644d6c023a WHIRLPOOL eb0e1bdc1f88ca0e6bfc49ffdc61ce2bb77b461ac1beb6a3d4e8238298bd5d07f9bb0c29b32085b757340d4deac8ab3f1fd1d4d21156e6326ca5940501e3e0f0
 AUX 2.1.2-libpng15.patch 536 SHA256 46a9b1f08aabf4c6afe879a40241a4ffe3fb0e7489e73e074be1fec3bfa580de SHA512 29f929401478beb652e04ca2b043b8dd10497251c7fd7d6668479269f06791f1419db37f0535c173ec6e29cbeb44da26d68b3413593517641d6fe9ae63090f72 WHIRLPOOL eabf81779214d2a6e9d2626e9d858ab0a7c0e01931d29661bd4ce7b308cd141772ed2fe3f906c66b0ad8b1b6b2d87865719c9e24951385d6d43af63b9aa08bf1
@@ -7,24 +7,25 @@ AUX 2.1.2-prll.patch 409 SHA256 23d968365bc5de71d43a9ef6bf2333dc749871b0ada84815
 AUX fix-makefile-shared.patch 2051 SHA256 d692b236634d76f3f9d3482d3cc7b05451c0a116ad6edb8ade9075523e6b9bdf SHA512 0c12bd5aea0a6175b7647ed61ae139113329058c42cfb56105ee35af35bdab9f61adfe635a1c3322dbff00ddfcee06383bbd6bd048cc7ded1961f3997a527358 WHIRLPOOL 11d9a3e93cc3af9570a0a3e6863d4cea1a4ec8c9266dfe0c7bf2499ef211f52d714eed12e2986a06126162628ce75ae0e3933e60419d28e3a2c6976ea387df11
 AUX glutbitmap.h 845 SHA256 ba4caf7c2e7135e80385c2d33d7c780a28f5e9fc3ac557e297f65b70ce925a81 SHA512 a11e8c23472ed8950c8b56fdfd57ddd9c6539f427437ab26a2d3561ad388ca24a36029dee9ff6b8af759eeadf89fbd45dd10279d8089e6978eec07858624c7da WHIRLPOOL dc835c2604b33711ba26f5e846c40920eff7a26071560625f4fcd86f0a5c2d488b1adad0918d3e23ebf8775d08695caf17819608289f3fc87d35d72ee1144cbd
 DIST molscript-2.1.2.tar.gz 412497 SHA256 01252931f5a3542d5659ddaa4ebceaed2e75becb8ed150dfa14b59da9a63ca01 SHA512 0f82936da3123770c0fdb703094dbb5289cc39e9f9ffd034d8dba563f8d615788f67040d38158ac2f203b480c5838a7d8e71ca07bc5098181c1e3cfea26703a4 WHIRLPOOL 1588f4dd47117f8da797a8bf62a2eba071106b1faca4f79b06e3093fe76092cae54476f1a0be995e3637173561ae6003fded264dd6d3a424d235488f95085a75
-EBUILD molscript-2.1.2-r1.ebuild 1546 SHA256 2f8a41b9387e55157a0e4f0cc2ff1ad38f3374bf36fcee8484aac3b4ee125320 SHA512 a156287998d278e12f08efde899ad75c12f2936d396c7b922794242a7f85fc2486b5f8b8f3287bcd0cf2c76193f113f6222da792c210fffe8bc5bd4f7b8a725b WHIRLPOOL 8334513c6a3b9f2d0b26bf5d32624e47165936d115b804d38a1acb8258a50ec7858d9accdd61d3c9a5e9f280829b88a5865e94b9dba17088c9a308e6484d7ca2
-EBUILD molscript-2.1.2-r2.ebuild 1521 SHA256 12fe58a3999f6719981da092b175dcec47aa99cf3f9a415127e55a59459ace81 SHA512 b58b8b05eb2e834a4bdb578a0a47594b85f9ec32df0ef53074723431d4db043a1edaf5e673f0eb977683a3cf5883eb04caf3d9822770f4997553e84fb7c5a71a WHIRLPOOL e8f5e60860459739d2a7696c6be09831c870b311895ec812974e7dd47b15a8d1a912b25430d4bd5bf289ec7a414a27dbc14d0e7d87690591e2215fbf4a2315cb
-MISC ChangeLog 2995 SHA256 3154f19fbf39b298f27382b1322219e61c9eac91fd6ab0393a01272602521800 SHA512 986736312896f33c66ac5798b3d7c6f04d4ea449fde4f0282aad93bbf17feeb44096398758193d96136a6c2f8446051ee90eb3a1b9992b82c6006fde8bdfd39a WHIRLPOOL d0ce44df910a69c2aaf54dc11383db0ac1dc5e3ed86cd9362e8dde0a161cccf8da2cf041617bfc58f91ea02baf1988e3b48271e4406deaba4bf2323f0a83af26
+EBUILD molscript-2.1.2-r2.ebuild 1529 SHA256 91bad6ea6ceb1fbe47fc3732db63a8a274f64585a1def031a1aed2596e391fa7 SHA512 9c5ce3b278a54a8b8ea68151d59b6b306a3a168e2f7e7dd2710b62ad90f9e84132b4660adf2b5a6a4e608ed594478d0f1078b5e5112015ba06d31e8d561e345e WHIRLPOOL 8c60c10beaa5b15d631b5d473c521278221b2fe3144d149bee760bf9a5744ba1091562348c385369dae4e27eef4ea6291efe2f55bd6b554f2b0a6e00b3a9e124
+MISC ChangeLog 3112 SHA256 7fad4b90086b3c09b9fe27c5efa3f86dc1868fdb63ba56d982cdec5d3ca3c7b7 SHA512 8fcb4f5d0cb61497fa7e18677fe693a0b2cb16964e1edf33d41c2ec179786929d44af7f910c19391073f982c98866be550891e8c57537369eacb81807ae317ba WHIRLPOOL 32371c32cd772d8faad416a98a795a5ca1cb4d7337187ef1c21fcb38a5b3c22b19e4230397a14fb360431a53a99b1e745a4f1c966dcf87585e3f0c1752c3b1b2
 MISC metadata.xml 168 SHA256 705462092174cd3e2e3ec1557a28108a746b7351f803d8ca6d1b925b3111c3ff SHA512 f0073fb277e20adb7781aa6ea7f8237bc2d350f0aa43f0f0cca33e02cf52b8fc117bd984c11721ac519a2637ea145976148ac1aba7335dc74c42f7b9531cbed3 WHIRLPOOL 07dd7a302e695440f5033889e5b20cada57beedf17ad33f95d45fb5c39da98bf206eaff13334c20c1c08140a9c5e6041341d29c58efc5ca59b112b60e1662318
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVZakSAAoJELp701BxlEWf9XUQALEKzX7PW1vIc+HQxYCvpFP0
-1Qaf3eYloLLupI0SQv7azdzSDGmfx43JIRgKfvoMnMkMk/DBn0Lr4tmvE3uQJ12Z
-7twgUZzgsfGewRZCIkkY5ZzIUgnGgvwxzQUMotDjHBi5dZQ4EeK8ZjeT2fypHKeC
-yA0wpDgKJVUVcmQM1XqUiN1KKY+3YKbS0jGR1aefSbeA3CBQ1tl5sNsYylWj+uz6
-THXa96OpMzarkYfP47gPpnSZ30yMvQcTgHjLPWvJl2Yd2L+NBMCj7TsRlsmmoxqr
-PU2FHXNDR3Rgt6Yzwt8mS3sngvMsHfFgoHdCg/hVHXzYWI0UacVRXXSQdqKri30U
-/2ubisGNOwCl18N3jBCt04QHP13GECeXRn7zcjM0vqiO/75x3jd9cHULwp+iwtVl
-DrjCW6PC8CDTJ5omEk21/Ql3z3F481VemRUV50dSpslAlUJiMZ5jOU/1rO/PFQ0C
-CfTvWJor5pKm/yvpIZ78Gw2+YOY5KtH0MdNx/gwOaieeNg60ol4/RbmgbSm18ckr
-bSXZITlhT6ynDWdm7yl69DKhdYVIFQSbtfuRwEnYp9ptjTvwIc49rc2I/gZIlo2A
-BL7sIAeEwS6CgdZ3MfEj+vQzySySZ/9Gjrj7btZY166r3hgTvIjX9V12ijKnLzW0
-ub1nx8eLBilRD1hF+a/v
-=hsfI
+iQJ8BAEBCgBmBQJVZrKBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiVA4P/3UxSwSPkgTv8/KmQrVpRe98
+2Hz8cxIvqDyxvvwDMTIQITmJzMWlEQd1NkOEyVuvlhNbdnuvqwPYKHheOwy8ut+J
+AWXVx2XR1fMVi80Oysp3HlxieFjQfx9hDCSUw1FH8Sca0roxjSDFdOI7A/k3HkgH
+xIk7K8UlEEcAGZWHEk25YFmCumnv9zHFpsmY56ACz8qRIuZ0IkQfzWu2iA9OjJYc
+7kaZdWbAEXXrqNjTS+7PacTDXwGtKVxcty2SK1qQJTz+/RXzy2JDXlK3YpfN9TCT
+wBMq9GeciWVUB6Y8RAHhAEfKGKbX0GxLbHtJoJYUSXao6ACDdvPCREngmpHBQdSG
+jYB6dn7RWDm+8MXFlCvIqXkJpRdnDR9JZ8dCVcag5QqLt4IEF0VcE7Ha3ShwSgqG
+ib3ibaBBtD564U4XvrYyNlRPt4FJSL+kS0vDNHauUksVKPsOZXWKnpofTW3YfRtB
+wKmSe9STiATPbyaAgjdTT0WrahQJuEexs9QSWCaqC2fGbQ1rz6RQT2gOkK2p8jri
+AGDEl+yAfboD4hsKNtOGvGV3uSiOvNWMPZfEiWR9+ePSnw50Yer8+AGsPIB6shmN
+sAow2jMutZmKUSaJ6SS7Fp93Eik2VWtJKzxuZjoIaMOmm1mI2hap1e0DcZylCxXi
+yeiEMX1tQoII27NBbY4k
+=rJyG
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/molscript/molscript-2.1.2-r1.ebuild b/sci-chemistry/molscript/molscript-2.1.2-r1.ebuild
deleted file mode 100644
index 71d7ca135e9d..000000000000
--- a/sci-chemistry/molscript/molscript-2.1.2-r1.ebuild
+++ /dev/null
@@ -1,65 +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/molscript/molscript-2.1.2-r1.ebuild,v 1.8 2011/08/09 08:25:28 ssuominen Exp $
-
-EAPI="3"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Display molecular 3D structures, such as proteins, in both schematic and detailed representations"
-HOMEPAGE="http://www.avatar.se/molscript/"
-SRC_URI="${P}.tar.gz"
-
-LICENSE="glut molscript"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-RESTRICT="fetch"
-IUSE=""
-
-DEPEND="
-	virtual/jpeg
-	media-libs/libpng
-	media-libs/gd
-	media-libs/freeglut
-	|| (	x11-libs/libXmu
-			x11-libs/libXext
-			x11-libs/libX11	)"
-RDEPEND="${DEPEND}"
-
-pkg_nofetch() {
-	elog "Please visit ${HOMEPAGE}"
-	elog "and get ${A}."
-	elog "Place it in ${DISTDIR}"
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/fix-makefile-shared.patch \
-		"${FILESDIR}"/${PV}-ldflags.patch \
-		"${FILESDIR}"/${PV}-prll.patch \
-		"${FILESDIR}"/${PV}-libpng15.patch
-
-	# Provide glutbitmap.h, because freeglut doesn't have it
-	cp "${FILESDIR}"/glutbitmap.h "${S}"/clib/
-
-	# Stop an incredibly hacky include
-	sed -i -e 's:<../lib/glut/glutbitmap.h>:"glutbitmap.h":g' \
-		"${S}"/clib/ogl_bitmap_character.c || die
-}
-
-src_compile() {
-	# Prefix of programs it links with
-	export FREEWAREDIR="${EPREFIX}/usr"
-
-	ln -s Makefile.complete Makefile
-
-	emake \
-		CC="$(tc-getCC)" \
-		COPT="${CFLAGS}" \
-		|| die "emake failed"
-}
-
-src_install() {
-	dobin molscript molauto || die
-	dohtml "${S}"/doc/*.html || die
-}
diff --git a/sci-chemistry/molscript/molscript-2.1.2-r2.ebuild b/sci-chemistry/molscript/molscript-2.1.2-r2.ebuild
index 1c6c3a7fcd48..81a77fcfd420 100644
--- a/sci-chemistry/molscript/molscript-2.1.2-r2.ebuild
+++ b/sci-chemistry/molscript/molscript-2.1.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molscript/molscript-2.1.2-r2.ebuild,v 1.5 2015/05/27 11:22:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molscript/molscript-2.1.2-r2.ebuild,v 1.6 2015/05/28 06:15:27 jlec Exp $
 
 EAPI=5
 
@@ -16,10 +16,10 @@ KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="
-	virtual/jpeg
-	media-libs/libpng
-	media-libs/gd:=
 	media-libs/freeglut
+	media-libs/gd:2=
+	media-libs/libpng:0=
+	virtual/jpeg:0=
 	|| (
 		x11-libs/libXmu
 		x11-libs/libXext