media-libs/jpeg -> virtual/jpeg. Drop old.

(Portage version: 2.1.9.24/cvs/Linux x86_64)

3 files changed, 7 insertions, 69 deletions

diff --git a/sci-chemistry/gopenmol/ChangeLog b/sci-chemistry/gopenmol/ChangeLog
index df2db237a534..71a80b0005fa 100644
--- a/sci-chemistry/gopenmol/ChangeLog
+++ b/sci-chemistry/gopenmol/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/gopenmol
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gopenmol/ChangeLog,v 1.10 2010/09/16 17:25:29 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gopenmol/ChangeLog,v 1.11 2010/11/08 17:12:40 xarthisius Exp $
+
+  08 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  -gopenmol-3.00-r1.ebuild, gopenmol-3.00-r2.ebuild:
+  media-libs/jpeg -> virtual/jpeg. Drop old.
 
   16 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   gopenmol-3.00-r1.ebuild, gopenmol-3.00-r2.ebuild:
diff --git a/sci-chemistry/gopenmol/gopenmol-3.00-r1.ebuild b/sci-chemistry/gopenmol/gopenmol-3.00-r1.ebuild
deleted file mode 100644
index 69f7181be76d..000000000000
--- a/sci-chemistry/gopenmol/gopenmol-3.00-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gopenmol/gopenmol-3.00-r1.ebuild,v 1.3 2010/09/16 17:25:29 scarabeus Exp $
-
-inherit eutils
-
-DESCRIPTION="gOpenMol is a tool for the visualization and analysis of molecular structures"
-HOMEPAGE="http://www.csc.fi/gopenmol"
-SRC_URI="${HOMEPAGE}/distribute/${P}-linux.tar.gz"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="=dev-lang/tcl-8.4*
-	=dev-lang/tk-8.4*
-	dev-tcltk/bwidget
-	virtual/opengl
-	media-libs/freeglut
-	media-libs/jpeg
-	dev-lang/python
-	x11-libs/libXmu
-	x11-libs/libICE
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXi
-	x11-libs/libXxf86vm"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/gOpenMol-${PV}/src"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${PV}-include-config-for-plugins.patch
-}
-
-src_compile() {
-	econf || die "./configure failed"
-
-	emake || die "emake failed"
-
-	# Plugins are not built by default
-	cd ${S}/plugins
-	emake || die "emake plugins failed"
-
-	# Utilities are not built by default
-	cd ${S}/utility
-	emake || die "emake utility failed"
-}
-
-src_install() {
-	einstall || die "einstall failed"
-
-	cd ${S}/plugins
-	einstall || die "einstall plugins failed"
-
-	cd ${S}/utility
-	einstall || die "einstall utility failed"
-
-	dosed /usr/bin/rungOpenMol
-}
-
-pkg_postinst() {
-	einfo "Run gOpenMol using the rungOpenMol script."
-}
diff --git a/sci-chemistry/gopenmol/gopenmol-3.00-r2.ebuild b/sci-chemistry/gopenmol/gopenmol-3.00-r2.ebuild
index 7a5891fca0aa..8f6c2adaa258 100644
--- a/sci-chemistry/gopenmol/gopenmol-3.00-r2.ebuild
+++ b/sci-chemistry/gopenmol/gopenmol-3.00-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gopenmol/gopenmol-3.00-r2.ebuild,v 1.3 2010/09/16 17:25:29 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gopenmol/gopenmol-3.00-r2.ebuild,v 1.4 2010/11/08 17:12:40 xarthisius Exp $
 
 EAPI="3"
 
@@ -20,7 +20,7 @@ IUSE=""
 RDEPEND="
 	=dev-lang/tk-8.4*
 	dev-tcltk/bwidget
-	media-libs/jpeg
+	virtual/jpeg
 	media-libs/freeglut
 	virtual/opengl
 	x11-libs/libICE