Drop old

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)

3 files changed, 9 insertions, 70 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/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