sci-chemistry/chimera-bin: Drop www-apps/py-swish-e dep as it is masked

Package-Manager: portage-2.2.12

6 files changed, 4 insertions, 289 deletions

diff --git a/sci-chemistry/chimera-bin/ChangeLog b/sci-chemistry/chimera-bin/ChangeLog
index 6d37a9f6b..239b4aede 100644
--- a/sci-chemistry/chimera-bin/ChangeLog
+++ b/sci-chemistry/chimera-bin/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 Sep 2014; Justin Lecher <jlec@gentoo.org> -chimera-bin-1.6.2.ebuild,
+  -chimera-bin-1.8.ebuild, -chimera-bin-1.8.1.ebuild, chimera-bin-1.9.ebuild:
+  Drop www-apps/py-swish-e dep as it is masked
+
 *chimera-bin-1.9 (27 Jun 2014)
 
   27 Jun 2014; Alexey Shvetsov <alexxy@gentoo.org> +chimera-bin-1.9.ebuild:
diff --git a/sci-chemistry/chimera-bin/Manifest b/sci-chemistry/chimera-bin/Manifest
index 7c906e7e1..be00f5675 100644
--- a/sci-chemistry/chimera-bin/Manifest
+++ b/sci-chemistry/chimera-bin/Manifest
@@ -1,8 +1,2 @@
-DIST chimera-1.6.2-linux.bin 83913372 SHA256 06285c0beb3dd61af98fcc5f7d3e0d71e90dd2c26070d9db8ee0c71dae378487 SHA512 3de715261eaafe3c4435221e919196e38ebc5a5815a2df6b035c45797be3a164a55d535b0cb774e588b9ffaee00c70bbb907d558be910fc13c5a8ccdf1fee5e3 WHIRLPOOL 47aa46b0d67a73a19a13619cccbbe7f4c41aba83f3616647d5390d14639a4335dcab7f209129a18f75400240114f1b40cf525e30c9269f6af88ebb9f5025c6f0
-DIST chimera-1.6.2-linux_x86_64.bin 89089984 SHA256 b5ade75e5759e53d29153b4dc3a88fd2fab501e4aa1599efd0f46a1b46e7bd2c SHA512 9cdb99167e39084c483ba192d921c45fbe54b453f71fa24d39eac307f24f799dcd3cc6b0374904f4e9c4836161d81864c5204dda07383a422732b5f81936b59b WHIRLPOOL 0cb90af5b073443aa6b432842fef4371941e684b9fcde6adf0e80a4abcc9654e1e80cd817acb0b9741dc43b9ac33b67b648c0f29d9b938fdb86de0550bd07140
-DIST chimera-1.8-linux.bin 107641016 SHA256 a42964463271ba95742340e228f438513616afe8abacd5487ce059b9f0195bc3 SHA512 1fefa0e1ca4ad8137e94cfd7815cf052117fb25d4300344b2c4f2eaf5cf136c5001d6575e8ff66435859d73dd4d7731cc99f0db0d473b7eed511800b28799d7b WHIRLPOOL 68bb343d6095b2cd27bcfaf9227ff52e58e625e35fc6a03badb5953374640cb4095d44b6a76ff1826e68b8da24b7a63cb60348795e8a60c41c5a17f115a31962
-DIST chimera-1.8-linux_x86_64.bin 109029644 SHA256 3734464f5140e0f24b3da53ed99a6ba3fd6f0fb11769b9a3aeb4f85d6f4a88a0 SHA512 2fc759cb7ba9092843ed675d9bdaeaec0d0958b4e6a951314478c1e1d43bdc048010cd3cf86111dc735eae74f190e8020ddbdcb292624d894d8e2ffcfb0c832e WHIRLPOOL 18a0d74ddef4dbf2ee419c43a371476aa8a3939520e133aaf456f9da5a3bc8b22ca67729667c9f4c76e38a5d3325b90d056e6bd4ca7d867c29ec7e148971f721
-DIST chimera-1.8.1-linux.bin 107610750 SHA256 b72b44df768e88a58ebd19a434c3566c0640e7fd7bb28a5ffd02c35ee9d5cc0c SHA512 ca67cacc11b85039cbeb193dc551e48a2103d9e7f07f6b9d5cb54dfcd9f615bd8ba64af2929dddc58a4f25099fd33b1d2facee43098338464761c08d4acec075 WHIRLPOOL c160cfbc851a774f1d6b370ed9ad89f9d9724a4de95bfd54bbc49599b8d0f5208eb5af24f21760d7647009e0b3fd2fee54c7f9a36f40e091638421f76d062683
-DIST chimera-1.8.1-linux_x86_64.bin 109033631 SHA256 39b21bdee683a6ea5b60c7e24f4723c5ca2febf419f4fa6adfb8f609c3e9d18c SHA512 3794e88de3a6fd1948fcf2be5a9512dfbdc11562125b2f6fcc57116f695ff0933a8d6c556ede3b94ab9d2e317f698c3ce1a5616aa8705e60a2a893f63007ecd5 WHIRLPOOL c2874cff46eb243d5b97e29bd16bf18ba07db514efd1653f3d2ddcab98e74dce0462c605141d0ecc1d7ad73fd0ffcb203035004d491ffc9bbfca8d14a3bd118f
 DIST chimera-1.9-linux.bin 114083133 SHA256 b9ea5def8692936bd8bdf2f7a4e0a34c0d4bfefb3c33cea1120459d9dde39902 SHA512 10f5550309a34c667c6af6ac11a62676f7320eb6fdd70e880fb5276893140a3f97d1eec7743248102f2e15316491564b1326526c2dee5c4d059929c5e4e45c38 WHIRLPOOL faeac184262c913bede52a5f8aa4636452c9de8bc006ce7c2eef54c225ad6b8df4ce62789f78970a7b5f5aca36fe1e29a0a27d7fe883d8f78529014cfd52a92c
 DIST chimera-1.9-linux_x86_64.bin 116013121 SHA256 f9b40b350ed034fd89f7e0b5ad1b7059745be2cff08263cd013c83c1b21fc23e SHA512 07a0c415d552452bb8e6b74818947fda4f1bc00b9ec7f421ea2f0b0731a27822a15f71126103651768cc34a5fd183f7828619886027df550b95740c8c0b50eff WHIRLPOOL bc522278af00a3d9fa826283870456b08090fd613645efde563b8937fe19117111b44bc42a1784e5e3aee4ef504caaed4c9412c0b91508e6bebe4f50d799e8bf
diff --git a/sci-chemistry/chimera-bin/chimera-bin-1.6.2.ebuild b/sci-chemistry/chimera-bin/chimera-bin-1.6.2.ebuild
deleted file mode 100644
index 07734d602..000000000
--- a/sci-chemistry/chimera-bin/chimera-bin-1.6.2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="An extensible Molecular Modelling System"
-HOMEPAGE="http://www.cgl.ucsf.edu/chimera"
-SRC_URI="
-	amd64? ( chimera-${PV}-linux_x86_64.bin )
-	x86? ( chimera-${PV}-linux.bin )"
-
-SLOT="0"
-LICENSE="chimera"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="prefix? ( dev-util/patchelf )"
-RDEPEND="
-	dev-lang/tcl
-	dev-lang/tk
-	dev-libs/expat
-	dev-libs/libotf
-	dev-libs/openssl:0
-	dev-libs/libpcre
-	sys-libs/zlib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/ftgl
-	media-libs/libpng:1.2
-	media-libs/tiff
-	media-libs/tiff:3
-	sci-libs/hdf5
-	sys-devel/gcc[openmp,fortran]
-	virtual/jpeg
-	virtual/glu
-	virtual/opengl
-	www-apps/swish-e
-	x11-libs/libX11
-	x11-libs/libICE
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXrender
-	x11-libs/libSM
-	x11-libs/libXt
-	|| ( x11-libs/libGLw <media-libs/mesa-8 )"
-
-S="${WORKDIR}"
-
-RESTRICT="fetch strip"
-
-QA_PREBUILT="opt/.*"
-
-pkg_nofetch() {
-	elog "Please visit"
-	elog "http://www.cgl.ucsf.edu/chimera/download.html"
-	elog "and download ${A} into ${DISTDIR}"
-}
-
-src_unpack() {
-	cp "${DISTDIR}"/${A} ${A}.zip
-	unzip ${A}.zip || die
-}
-
-src_install() {
-	chmod +x ./chimera.bin
-	dodir /opt/
-	./chimera.bin -d foo || die
-	doicon foo/chimeraIcon.png
-	mv foo "${ED}/opt/${PN}" || die
-
-	cat >> "${T}"/chimera <<- EOF
-	#!${EPREFX}/bin/bash
-
-	export PATH="${EPREFIX}/opt/${PN}/bin:\${PATH}"
-	"${EPREFIX}/opt/${PN}/bin/chimera" \$@
-	EOF
-
-	exeinto /opt/bin/
-	doexe "${T}"/chimera
-
-	make_desktop_entry "${EPREFIX}/opt/bin/chimera" Chimera chimeraIcon
-
-	if use prefix; then
-		local i
-		for i in "${ED}"/opt/${PN}/bin/{tiffcp,povray,al2co} "${ED}"/opt/${PN}/lib/*.so; do
-			patchelf --set-rpath "${EPREFIX}/usr/lib:${EPREFIX}/opt/${PN}/lib" "${i}" || die
-		done
-	fi
-}
diff --git a/sci-chemistry/chimera-bin/chimera-bin-1.8.1.ebuild b/sci-chemistry/chimera-bin/chimera-bin-1.8.1.ebuild
deleted file mode 100644
index 07734d602..000000000
--- a/sci-chemistry/chimera-bin/chimera-bin-1.8.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="An extensible Molecular Modelling System"
-HOMEPAGE="http://www.cgl.ucsf.edu/chimera"
-SRC_URI="
-	amd64? ( chimera-${PV}-linux_x86_64.bin )
-	x86? ( chimera-${PV}-linux.bin )"
-
-SLOT="0"
-LICENSE="chimera"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="prefix? ( dev-util/patchelf )"
-RDEPEND="
-	dev-lang/tcl
-	dev-lang/tk
-	dev-libs/expat
-	dev-libs/libotf
-	dev-libs/openssl:0
-	dev-libs/libpcre
-	sys-libs/zlib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/ftgl
-	media-libs/libpng:1.2
-	media-libs/tiff
-	media-libs/tiff:3
-	sci-libs/hdf5
-	sys-devel/gcc[openmp,fortran]
-	virtual/jpeg
-	virtual/glu
-	virtual/opengl
-	www-apps/swish-e
-	x11-libs/libX11
-	x11-libs/libICE
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXrender
-	x11-libs/libSM
-	x11-libs/libXt
-	|| ( x11-libs/libGLw <media-libs/mesa-8 )"
-
-S="${WORKDIR}"
-
-RESTRICT="fetch strip"
-
-QA_PREBUILT="opt/.*"
-
-pkg_nofetch() {
-	elog "Please visit"
-	elog "http://www.cgl.ucsf.edu/chimera/download.html"
-	elog "and download ${A} into ${DISTDIR}"
-}
-
-src_unpack() {
-	cp "${DISTDIR}"/${A} ${A}.zip
-	unzip ${A}.zip || die
-}
-
-src_install() {
-	chmod +x ./chimera.bin
-	dodir /opt/
-	./chimera.bin -d foo || die
-	doicon foo/chimeraIcon.png
-	mv foo "${ED}/opt/${PN}" || die
-
-	cat >> "${T}"/chimera <<- EOF
-	#!${EPREFX}/bin/bash
-
-	export PATH="${EPREFIX}/opt/${PN}/bin:\${PATH}"
-	"${EPREFIX}/opt/${PN}/bin/chimera" \$@
-	EOF
-
-	exeinto /opt/bin/
-	doexe "${T}"/chimera
-
-	make_desktop_entry "${EPREFIX}/opt/bin/chimera" Chimera chimeraIcon
-
-	if use prefix; then
-		local i
-		for i in "${ED}"/opt/${PN}/bin/{tiffcp,povray,al2co} "${ED}"/opt/${PN}/lib/*.so; do
-			patchelf --set-rpath "${EPREFIX}/usr/lib:${EPREFIX}/opt/${PN}/lib" "${i}" || die
-		done
-	fi
-}
diff --git a/sci-chemistry/chimera-bin/chimera-bin-1.8.ebuild b/sci-chemistry/chimera-bin/chimera-bin-1.8.ebuild
deleted file mode 100644
index 07734d602..000000000
--- a/sci-chemistry/chimera-bin/chimera-bin-1.8.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="An extensible Molecular Modelling System"
-HOMEPAGE="http://www.cgl.ucsf.edu/chimera"
-SRC_URI="
-	amd64? ( chimera-${PV}-linux_x86_64.bin )
-	x86? ( chimera-${PV}-linux.bin )"
-
-SLOT="0"
-LICENSE="chimera"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="prefix? ( dev-util/patchelf )"
-RDEPEND="
-	dev-lang/tcl
-	dev-lang/tk
-	dev-libs/expat
-	dev-libs/libotf
-	dev-libs/openssl:0
-	dev-libs/libpcre
-	sys-libs/zlib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/ftgl
-	media-libs/libpng:1.2
-	media-libs/tiff
-	media-libs/tiff:3
-	sci-libs/hdf5
-	sys-devel/gcc[openmp,fortran]
-	virtual/jpeg
-	virtual/glu
-	virtual/opengl
-	www-apps/swish-e
-	x11-libs/libX11
-	x11-libs/libICE
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXrender
-	x11-libs/libSM
-	x11-libs/libXt
-	|| ( x11-libs/libGLw <media-libs/mesa-8 )"
-
-S="${WORKDIR}"
-
-RESTRICT="fetch strip"
-
-QA_PREBUILT="opt/.*"
-
-pkg_nofetch() {
-	elog "Please visit"
-	elog "http://www.cgl.ucsf.edu/chimera/download.html"
-	elog "and download ${A} into ${DISTDIR}"
-}
-
-src_unpack() {
-	cp "${DISTDIR}"/${A} ${A}.zip
-	unzip ${A}.zip || die
-}
-
-src_install() {
-	chmod +x ./chimera.bin
-	dodir /opt/
-	./chimera.bin -d foo || die
-	doicon foo/chimeraIcon.png
-	mv foo "${ED}/opt/${PN}" || die
-
-	cat >> "${T}"/chimera <<- EOF
-	#!${EPREFX}/bin/bash
-
-	export PATH="${EPREFIX}/opt/${PN}/bin:\${PATH}"
-	"${EPREFIX}/opt/${PN}/bin/chimera" \$@
-	EOF
-
-	exeinto /opt/bin/
-	doexe "${T}"/chimera
-
-	make_desktop_entry "${EPREFIX}/opt/bin/chimera" Chimera chimeraIcon
-
-	if use prefix; then
-		local i
-		for i in "${ED}"/opt/${PN}/bin/{tiffcp,povray,al2co} "${ED}"/opt/${PN}/lib/*.so; do
-			patchelf --set-rpath "${EPREFIX}/usr/lib:${EPREFIX}/opt/${PN}/lib" "${i}" || die
-		done
-	fi
-}
diff --git a/sci-chemistry/chimera-bin/chimera-bin-1.9.ebuild b/sci-chemistry/chimera-bin/chimera-bin-1.9.ebuild
index 07734d602..f9efc6933 100644
--- a/sci-chemistry/chimera-bin/chimera-bin-1.9.ebuild
+++ b/sci-chemistry/chimera-bin/chimera-bin-1.9.ebuild
@@ -37,7 +37,6 @@ RDEPEND="
 	virtual/jpeg
 	virtual/glu
 	virtual/opengl
-	www-apps/swish-e
 	x11-libs/libX11
 	x11-libs/libICE
 	x11-libs/libXext