Version Bump; Drop old with unavailable upstream sources, #542758

Package-Manager: portage-2.2.18/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

7 files changed, 36 insertions, 545 deletions

diff --git a/sci-chemistry/arp-warp-bin/ChangeLog b/sci-chemistry/arp-warp-bin/ChangeLog
index 4323de1a27bd..a9847a4d1ae6 100644
--- a/sci-chemistry/arp-warp-bin/ChangeLog
+++ b/sci-chemistry/arp-warp-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/arp-warp-bin
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/arp-warp-bin/ChangeLog,v 1.25 2013/06/04 12:49:48 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/arp-warp-bin/ChangeLog,v 1.26 2015/03/11 13:31:52 jlec Exp $
+
+*arp-warp-bin-7.5 (11 Mar 2015)
+
+  11 Mar 2015; Justin Lecher <jlec@gentoo.org> +arp-warp-bin-7.5.ebuild,
+  -arp-warp-bin-7.1-r1.ebuild, -arp-warp-bin-7.1-r2.ebuild,
+  -arp-warp-bin-7.3.ebuild, -files/7.1-setup-2.patch, -files/7.1-setup.patch:
+  Version Bump; Drop old with unavailable upstream sources, #542758
 
   04 Jun 2013; Justin Lecher <jlec@gentoo.org> arp-warp-bin-7.1-r2.ebuild:
   Fix for correct usage of new python eclasses
@@ -104,4 +111,3 @@
   +metadata.xml, +arp-warp-bin-7.0.1-r1.ebuild:
   (#212054) New package: ARP/wARP is a software for improvement and
   interpretation of crystallographic electron density maps.
-
diff --git a/sci-chemistry/arp-warp-bin/Manifest b/sci-chemistry/arp-warp-bin/Manifest
index 9d51822f97b9..7d3188de897d 100644
--- a/sci-chemistry/arp-warp-bin/Manifest
+++ b/sci-chemistry/arp-warp-bin/Manifest
@@ -1,20 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX 7.1-setup-2.patch 5884 SHA256 6fafb3c56004d65f0c03babcca7fcfb8a9a5d203aaffe5ea9f30b16e9249b531 SHA512 1bbef969e4db1732c910f62ca12c264bc54c84d4b38ac97eac38525430f93eeca11b3753e1b682a80e25b50ec6ad2219a309c77f8cda9ace54e8889c964855ef WHIRLPOOL ebc8845538786e96e56e8c26a1a9612126ee95663739e058e149923ec38c42eccc9e42e8e4cccf5bf6b04f0d6c56820c278874210395a3bba26a65b9e08ed0ed
-AUX 7.1-setup.patch 6277 SHA256 4d4ae302589270ee73fc41d6f8231ba64969e2828578528a1bc06ff926507d06 SHA512 cf7a13f130892f9bf541e4ce509f3b2e3707b88ccafd5562840291f9fd2e357336cb4c70f104ab29eaa83c3862f2ed75e00eb2ed07b10539ad256c58c8d1df3a WHIRLPOOL 599ed9315a66f4be88d572c64fc4e74409a75722f344b502e02dc2ef82489f2b7d608cd0afa2e48cb7202077ef2cbe2dd2d3f49f6dd22d23fc4430655581879d
 AUX 7.3-setup.patch 995 SHA256 21baa87f48981ca016b5b94e5b821e7eef088a666da1a17ffa38f17366e20983 SHA512 046d2f6dc0c5e805efbb9d34b16004f4166535692f1ff4175bbde92053feb8b6953044ca8e83b0dfc41526d2451f41584721ba1e8ed4932dceeb5eb11955403f WHIRLPOOL 2be0e827fedd3ae39d1b6f5b428b9d85f62fdc40075cf4beb206dc18ac7988929f9312b61be6166a30bbc49429a66fd7b214f3624e3690e80636a24fc0730ef1
-DIST arp_warp_7.1.tar.gz 195970881 SHA256 e3496283eb1d63ce0ce84b32812ababe0ac266a270918f93f333d036ba36f8c3 SHA512 9ccf704fc2a7c1abe3fac26a9b2912001a7943bcbb852c151ac1813b5d2c9f9d40faf897e603decf7382f3d53bc35f286712ef31c548ec2da08ac2d7187e40d8 WHIRLPOOL 37b0e82874dd5f9d9b226d160e208d17d6cb374e7bcd63aeae3a3cfe20c4cac277cafa3af493728d683ea78f548751d2e542a8a90adc136a4b96c8e667e7b600
-DIST arp_warp_7.3.tar.gz 214713802 SHA256 00b041ea8ba0889344103020ead0a571cc654add889703357909378a6dc82485 SHA512 f23d8cc85e7c037e76316496390c48ff25db54551a4b490a6d35d62c2a9af94997cfae3887cc05794b365586cf73c7ef6ef2026d06573382ef634694ce8886ad WHIRLPOOL 6b60aa2c279702f73576623a734b29728768a248742abfd2af1c60e14fce1a12b1ee0ed6f9663b4aaa0f17361ccb66c2e4769761fdda27d8c86c5ddfb61edda9
-EBUILD arp-warp-bin-7.1-r1.ebuild 2768 SHA256 448ff8d8e0767c81f699aa1a0a40ba67d82db8c8246c99272b331867a83baa3a SHA512 93274fead017d7b3b445f81a530975f81106e4a59d57cade7fed2f6aae4c90186b244cf3b3d861642864212d91d781ec1de697de7aa47624b1855395923d465b WHIRLPOOL 99c42a7947de6081e97c7e27213ddfb90c37fe8ae16b557d57c4f9c265217a298b583a2fa1ad166a5f5e7f57baa695d92e4c2f1e4ff5afa933cfd21fc9b9a2f2
-EBUILD arp-warp-bin-7.1-r2.ebuild 2583 SHA256 d6dc2a86212ef313a7639365a7e6b487bd7f0ebe3ea3849e7c1029733f120bed SHA512 40f206d099309d3aa1786b5c8acc64cdd08eb4e72362cec097d1320e0241e9566b2cf6109181c086f32f3c3e8a04fe08b7be0bee270217930c66e1d5599eff99 WHIRLPOOL 25899a374bbbac4117d80e70aa0db90a4a7113f960f33ab4a70621ba57547ab9271b83e3c2ca4185b2a2abbcaaab39105a1f0e9eca4a6298cc3c40679ea91674
-EBUILD arp-warp-bin-7.3.ebuild 2166 SHA256 ba66691b7088676b927d6afa883be5038ad934201a8c00c7a3a0c870e997631f SHA512 1d16e1cbfcf9fb38147d6c76c9077746f34998a5d50cfc820b9bcede94bb994089b5a0b4c801fc5ab5c8870d444217b4f17e4f4e9e3dcc1502874ec6adb71189 WHIRLPOOL 69de299c12a4d2834670ec3007d38e94f5c2229e2f701f2edc80c3426f9f5b632042fd5399b9b8eb533c78bb4141c2deff8eb1c0ae1f27a9585960cdde1113de
-MISC ChangeLog 3898 SHA256 f330ec558b165a2e7f9ac0c7381db956effba3a8264e47803e100d1285e9f583 SHA512 718371f8c72abecd791994c8eedb2f0c5a081af42d64db9a640218bec1724a9b35a2aa5fd191aa32a3060c07eab63c0ff6545aceadb80dfb7f073b4caa6a4d1a WHIRLPOOL e4f850ffd13af86354f4aaa8ddd8c3308802feecab7c5f40ddf2adb5af7fd173bbf415741a82de9f94e9b02ec0634e31686ce7b2b834e2bc0b5e26e4452aeccb
+DIST arp_warp_7.5.tar.gz 198643246 SHA256 d16fc6775905e56e5159f4a658f654b98d94f78143a2537ba67bffaed7ef1ad8 SHA512 351ed4bad863bac63005d128c693b7dde60c03ca5e8bd449ea602646f7f856c022070e542bcacae2793fbde88d67e7b5639bedeec55eeb191017a2ec19d03768 WHIRLPOOL d4ea42179a8a406508c82320567dc39ce419a2cba8b9e6ed05739dbbf0c9aba072b720c56987c4c94806ba2772f9c8787bde898f7c76543cc4702f00b7f16532
+EBUILD arp-warp-bin-7.5.ebuild 2087 SHA256 cd26d6f00250218e5ce70097b7bcd5b0f843d903e2cc559def992f6c238bd398 SHA512 9ea8a117903be0f4850ca55ee42afe4d9b1e9a05b435105d0f11987e07ccf9eee1cdcd21c6366029047d89ce2468871c2a4f9cc54bb5cc6d31d4d1c06452d4f7 WHIRLPOOL 7361da7807d91dd25f379dbb8dec42b5f0f89d485e18d3959fa7b09f8b1969faf2dd05fe029913e3b3d97fd8c2b778af90b995143a0a31bab33631437ca42fb2
+MISC ChangeLog 4210 SHA256 a6cc1ee6bdfda703da1ad0ef420fd42d75ff491eeed78c303861e9443e90585b SHA512 f759f08293a44942aa3adeec64a30f1f15b74b6b071bdd7e11fd66f7d18d33c8322b4b3cf3d4b26a57b3873dd786766da2cd88e8ac04f483eb1ec35c69fd238d WHIRLPOOL 9e249e189c12cc5849f56c69d10449fc4bf9f2753093ee44f54b92d3f4a2e84de9e4f381385a67175b9532f3a52646207333d0fc515176e75fcf5d3b1da567cf
 MISC metadata.xml 168 SHA256 705462092174cd3e2e3ec1557a28108a746b7351f803d8ca6d1b925b3111c3ff SHA512 f0073fb277e20adb7781aa6ea7f8237bc2d350f0aa43f0f0cca33e02cf52b8fc117bd984c11721ac519a2637ea145976148ac1aba7335dc74c42f7b9531cbed3 WHIRLPOOL 07dd7a302e695440f5033889e5b20cada57beedf17ad33f95d45fb5c39da98bf206eaff13334c20c1c08140a9c5e6041341d29c58efc5ca59b112b60e1662318
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREKAAYFAlGt4m0ACgkQgAnW8HDreRYQrACgrXB2mJyqwypbk9XviYOZg7hg
-KmsAoKIbM0RiMRcKgavmCGc+bWVp7k9a
-=9qbg
+iQJ8BAEBCgBmBQJVAEPJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir3XsP/0vqHiGpK2qp/7G4QdHDwo8d
+3yGKUKytI5Gq93JMeZryF/VDfM/5N9DTC+zacIs1lnfvddyW6BGW+/FwwmB4Dmud
+cz5OzvHLLWASJhJoYCNpyc3CTqvXOCdLGkmrPds+LDAHrrrxy1YcR67cl2uS3/81
+yQ0cWxfu7Hck2M/+1qWU6DjmuKZfaRc3Al7b8OOMYXQMhCqX8LuL7mDv97zgAIiV
+sCTtmXvEkQnJ73I3s53iBUzCm8K6o9QlgGitJbtNLZf9BaH2+hpcdgeRRQ/sGvjE
+Xbkh5Grs94OcaI56V5wF5H/bKjSmA/CL7KQRYAr8kKEnB6T7mDoGVZUslBYQRaJP
+uhhEF1/E/vgqUZUnb3kE35pN03eTs88RIhdtZGawz8H0ftAYS+qew3t0XwLNoDog
+rvw/iaNLJJ55cXgf06MZQD+Bq19gJgz/PM+brrT4ZWq2E+cNymqTZVDFFRSwV71t
+9JnkUcz2OrfpuibvklXXvrKF3F1ekcQkKra05mtafuwZr/sM7LNjY8IjCMLno4kN
+0WnjQXU8vWMzEZsFgUwL6yUndNwORwdatNE6HZwiBLrpx0mFgjSTHXP4RChQkv0d
++uTsOj4B9Q9GkX74FxzmYWF8qkQUCVkDfs26I+5Eo86qh+QBLpviAwtgYPkPKKsU
+J9WkOwWAE9PvJyrDxf36
+=/N5O
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1-r1.ebuild b/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1-r1.ebuild
deleted file mode 100644
index 71a672724ba8..000000000000
--- a/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1-r1.ebuild,v 1.6 2013/02/06 07:55:47 jlec Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-
-inherit eutils prefix python
-
-MY_P="arp_warp_${PV}"
-
-DESCRIPTION="Software for improvement and interpretation of crystallographic electron density maps"
-SRC_URI="${MY_P}.tar.gz"
-HOMEPAGE="http://www.embl-hamburg.de/ARP/"
-
-LICENSE="ArpWarp"
-SLOT="0"
-KEYWORDS="-* amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	app-shells/tcsh
-	sci-chemistry/refmac
-	virtual/awk
-	virtual/jre
-	virtual/opengl
-	x11-libs/libX11"
-DEPEND=""
-
-RESTRICT="fetch"
-
-S="${WORKDIR}/${MY_P}"
-
-QA_PREBUILT="opt/arp-warp-bin/bin/*"
-
-pkg_nofetch(){
-	elog "Fill out the form at http://www.embl-hamburg.de/ARP/"
-	elog "and place ${A} in ${DISTDIR}"
-}
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-setup.patch
-	eprefixify "${S}"/share/arpwarp_setup_base.*
-	sed "s:PYVER:$(python_get_version):g" -i "${S}"/share/arpwarp_setup_base.*
-	python_convert_shebangs $(python_get_version) flex-wARP-src-354/*py
-	sed -e "s:/usr/:${EPREFIX}/usr/:g" -i flex-wARP-src-354/*py || die
-	sed -e '/exit/d' -i "${S}"/share/arpwarp_setup_base.* || die
-}
-
-src_install(){
-	PYVER=$(python_get_version)
-	m_type=$(uname -m)
-	os_type=$(uname)
-
-	insinto /opt/${PN}/byte-code/python-${PYVER}
-	doins "${S}"/flex-wARP-src-354/*py || die
-
-	exeinto /opt/${PN}/bin/bin-${m_type}-${os_type}
-	doexe "${S}"/bin/bin-${m_type}-${os_type}/* && \
-	doexe "${S}"/share/*sh || die
-
-	insinto /opt/${PN}/bin/bin-${m_type}-${os_type}
-	doins "${S}"/share/*{gif,bmp,XYZ,bash,csh,dat,lib,tbl,llh} || die
-
-	insinto /etc/profile.d/
-	newins "${S}"/share/arpwarp_setup_base.csh 90arpwarp_setup.csh && \
-	newins "${S}"/share/arpwarp_setup_base.bash 90arpwarp_setup.sh || die
-
-	dodoc "${S}"/README manual/UserGuide${PV}.pdf || die
-	dohtml -r "${S}"/manual/html/* || die
-}
-
-pkg_postinst(){
-	python_need_rebuild
-	python_mod_optimize /opt/${PN}/byte-code/python-${PYVER}
-
-	testcommand=$(echo 3 2 | awk '{printf"%3.1f",$1/$2}')
-	if [ $testcommand == "1,5" ];then
-	  ewarn "*** ERROR ***"
-	  ewarn "   3/2=" $testcommand
-	  ewarn "Invalid decimal separator (must be ".")"
-	  ewarn "You need to set this correctly!!!"
-	  echo
-	  ewarn "One way of setting the decimal separator is:"
-	  ewarn "setenv LC_NUMERIC C' in your .cshrc file"
-	  ewarn "\tor"
-	  ewarn "export LC_NUMERIC=C' in your .bashrc file"
-	  ewarn "Otherwise please consult your system manager"
-	fi
-
-	grep -q sse2 /proc/cpuinfo || einfo "The CPU is lacking SSE2! You should use the cluster at EMBL-Hamburg."
-	echo
-}
-
-pkg_postrm() {
-	python_mod_cleanup /opt/${PN}/byte-code/python-${PYVER}
-}
diff --git a/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1-r2.ebuild b/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1-r2.ebuild
deleted file mode 100644
index 38c4ee5bc382..000000000000
--- a/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/arp-warp-bin/arp-warp-bin-7.1-r2.ebuild,v 1.2 2013/06/04 12:49:48 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit eutils prefix python-single-r1
-
-MY_P="arp_warp_${PV}"
-
-DESCRIPTION="Software for improvement and interpretation of crystallographic electron density maps"
-SRC_URI="${MY_P}.tar.gz"
-HOMEPAGE="http://www.embl-hamburg.de/ARP/"
-
-LICENSE="ArpWarp"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-shells/tcsh
-	sci-chemistry/refmac
-	virtual/awk
-	virtual/jre
-	virtual/opengl
-	x11-libs/libX11"
-DEPEND=""
-
-RESTRICT="fetch"
-
-S="${WORKDIR}/${MY_P}"
-
-QA_PREBUILT="opt/arp-warp-bin/bin/*"
-
-pkg_nofetch(){
-	elog "Fill out the form at http://www.embl-hamburg.de/ARP/"
-	elog "and place ${A} in ${DISTDIR}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-setup.patch
-	eprefixify "${S}"/share/arpwarp_setup_base.*
-	sed "s:EPYTHON:${EPYTHON}:g" -i "${S}"/share/arpwarp_setup_base.* || die
-	python_fix_shebang flex-wARP-src-354/*py
-	sed -e "s:/usr/:${EPREFIX}/usr/:g" -i flex-wARP-src-354/*py || die
-	sed -e '/exit/d' -i "${S}"/share/arpwarp_setup_base.* || die
-}
-
-src_install(){
-	m_type=$(uname -m)
-	os_type=$(uname)
-
-	insinto /opt/${PN}/byte-code/${EPYTHON}
-	doins "${S}"/flex-wARP-src-354/*py
-
-	exeinto /opt/${PN}/bin/bin-${m_type}-${os_type}
-	doexe "${S}"/bin/bin-${m_type}-${os_type}/* "${S}"/share/*sh
-
-	insinto /opt/${PN}/bin/bin-${m_type}-${os_type}
-	doins "${S}"/share/*{gif,bmp,XYZ,bash,csh,dat,lib,tbl,llh}
-
-	insinto /etc/profile.d/
-	newins "${S}"/share/arpwarp_setup_base.csh 90arpwarp_setup.csh
-	newins "${S}"/share/arpwarp_setup_base.bash 90arpwarp_setup.sh
-
-	dodoc "${S}"/README manual/UserGuide${PV}.pdf
-	dohtml -r "${S}"/manual/html/*
-
-	python_optimize "${ED}"/opt/${PN}/byte-code/${EPYTHON}
-}
-
-pkg_postinst(){
-	testcommand=$(echo 3 2 | awk '{printf"%3.1f",$1/$2}')
-	if [ $testcommand == "1,5" ];then
-	  ewarn "*** ERROR ***"
-	  ewarn "   3/2=" $testcommand
-	  ewarn "Invalid decimal separator (must be ".")"
-	  ewarn "You need to set this correctly!!!"
-	  echo
-	  ewarn "One way of setting the decimal separator is:"
-	  ewarn "setenv LC_NUMERIC C' in your .cshrc file"
-	  ewarn "\tor"
-	  ewarn "export LC_NUMERIC=C' in your .bashrc file"
-	  ewarn "Otherwise please consult your system manager"
-	fi
-
-	grep -q sse2 /proc/cpuinfo || einfo "The CPU is lacking SSE2! You should use the cluster at EMBL-Hamburg."
-	echo
-}
diff --git a/sci-chemistry/arp-warp-bin/arp-warp-bin-7.3.ebuild b/sci-chemistry/arp-warp-bin/arp-warp-bin-7.5.ebuild
index 712753461926..d31aa2587b72 100644
--- a/sci-chemistry/arp-warp-bin/arp-warp-bin-7.3.ebuild
+++ b/sci-chemistry/arp-warp-bin/arp-warp-bin-7.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/arp-warp-bin/arp-warp-bin-7.3.ebuild,v 1.1 2013/06/01 16:07:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/arp-warp-bin/arp-warp-bin-7.5.ebuild,v 1.1 2015/03/11 13:31:52 jlec Exp $
 
 EAPI=5
 
@@ -8,14 +8,16 @@ inherit eutils prefix
 
 MY_P="arp_warp_${PV}"
 
-DESCRIPTION="Software for improvement and interpretation of crystallographic electron density maps"
+DESCRIPTION="Improvement and interpretation of crystallographic electron density maps"
 SRC_URI="${MY_P}.tar.gz"
 HOMEPAGE="http://www.embl-hamburg.de/ARP/"
 
 LICENSE="ArpWarp"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
+KEYWORDS="-* amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="cpu_flags_x86_sse2"
+
+REQUIRED_USE="cpu_flags_x86_sse2"
 
 RDEPEND="
 	app-shells/tcsh
@@ -38,7 +40,7 @@ pkg_nofetch(){
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PV}-setup.patch
+	epatch "${FILESDIR}"/7.3-setup.patch
 	eprefixify "${S}"/share/arpwarp_setup_base.*
 
 	sed -e '/exit/d' -i "${S}"/share/arpwarp_setup_base.* || die
@@ -76,7 +78,4 @@ pkg_postinst(){
 	  ewarn "export LC_NUMERIC=C' in your .bashrc file"
 	  ewarn "Otherwise please consult your system manager"
 	fi
-
-	grep -q sse2 /proc/cpuinfo || einfo "The CPU is lacking SSE2! You should use the cluster at EMBL-Hamburg."
-	echo
 }
diff --git a/sci-chemistry/arp-warp-bin/files/7.1-setup-2.patch b/sci-chemistry/arp-warp-bin/files/7.1-setup-2.patch
deleted file mode 100644
index 894aad3f55b8..000000000000
--- a/sci-chemistry/arp-warp-bin/files/7.1-setup-2.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-diff --git a/share/arpwarp_setup_base.bash b/share/arpwarp_setup_base.bash
-index 29e769c..0b8a51e 100644
---- a/share/arpwarp_setup_base.bash
-+++ b/share/arpwarp_setup_base.bash
-@@ -13,10 +13,10 @@ else
-     identifier=${nameprocessor}'-'${namesystem}
- fi
- #
--arpwarphome="$1X"
-+arpwarphome="@GENTOO_PORTAGE_EPREFIX@/opt/arp-warp-bin"
- #
- export warpbin=${arpwarphome}/bin/bin-${identifier}
--export warpdoc=${arpwarphome}/manual
-+export warpdoc=@GENTOO_PORTAGE_EPREFIX@/usr/share/doc/arp-warp-bin-7.1/html/
- export PATH=${warpbin}:${PATH}
- #
- # Checks for existence of $warpbin directory
-@@ -59,7 +59,7 @@ if [ "$testccp" = '0' ]; then
-     fi
- 
- ##    2. Complement by other potential places for python :
--    search_list="${search_list} /usr/local/bin/python /usr/bin/python"
-+    search_list="${search_list} @GENTOO_PORTAGE_EPREFIX@/usr/bin/EPYTHON"
-     flex_wARP_python="/dev/null"
- 
- ##    3. Pick up the first one of the list which seems reasonable :
-@@ -83,34 +83,6 @@ if [ "$testccp" = '0' ]; then
-             export flex_wARP_bin=${HOME}/.flex-wARP/python-${pythonvrs1}.${pythonvrs2}
-             break
-         fi
--#        3.c Otherwise, we should be able to create the byte-code using the python.
--        /bin/mkdir -p ${arpwarphome}/byte-code/python-${pythonvrs1}.${pythonvrs2} 1> /dev/null 2>&1
--        if [ 0 != $? ] ; then
--            /bin/mkdir -p ${HOME}/.flex-wARP/python-${pythonvrs1}.${pythonvrs2} 1> /dev/null 2>&1
--            export flex_wARP_bin=${HOME}/.flex-wARP/python-${pythonvrs1}.${pythonvrs2}
--        else
--            export flex_wARP_bin=${arpwarphome}/byte-code/python-${pythonvrs1}.${pythonvrs2}
--        fi
--#        pushd ${flex_wARP_bin} 1> /dev/null 2>&1
--        here_now=$(pwd)
--        cd ${flex_wARP_bin}
--        if [ 0 != $? ] ; then 
--            export flex_wARP_bin=${HOME}/.flex-wARP/python-${pythonvrs1}.${pythonvrs2}
--            /bin/mkdir -p ${flex_wARP_bin} 1> /dev/null 2>&1
--#            pushd ${flex_wARP_bin} 1> /dev/null 2>&1
--	        cd ${flex_wARP_bin}
--        fi
--        /bin/cp -p ${arpwarphome}/flex-wARP-src/*.py .
--        ${python_to_test} ./compile.py
--        /bin/rm -f *.py
--#        popd 1> /dev/null 2>&1
--		cd ${here_now}
--        if [ -e ${flex_wARP_bin}/CPyWARP.pyc ] ; then
--            export flex_wARP_python=${python_to_test}
--            echo "Created a new set of flex-wARP byte code in the directory :"
--            echo "  '${flex_wARP_bin}'"
--            break
--        fi
-     done
- ##    4. If nothing is available, print out a message.
-     if [ "/dev/null" != ${flex_wARP_python} ] ; then
-@@ -130,14 +102,6 @@ if [ "$testccp" = '0' ]; then
- fi
- 
- #
--# Setting up library path for SGI
--if [[ "${namesystem}" = 'IRIX64' || "${namesystem}" = 'IRIX' ]]; then
--    if test "$LD_LIBRARY_PATH"; then
--        export LD_LIBRARY_PATH=${warpbin}:${LD_LIBRARY_PATH}
--    else
--        export LD_LIBRARY_PATH=${warpbin}
--    fi
--fi
- #   echo
- #   echo 'ARP/wARP Version 7.1 has been setup'
- #
-diff --git a/share/arpwarp_setup_base.csh b/share/arpwarp_setup_base.csh
-index 41b11e9..a4edcff 100644
---- a/share/arpwarp_setup_base.csh
-+++ b/share/arpwarp_setup_base.csh
-@@ -13,7 +13,7 @@ else
-     set identifier = ${nameprocessor}'-'${namesystem}
- endif
- #
--set arpwarphome = '$1X'
-+set arpwarphome = '@GENTOO_PORTAGE_EPREFIX@/opt/arp-warp-bin'
- #
- setenv warpbin ${arpwarphome}/bin/bin-${identifier}
- #
-@@ -27,7 +27,7 @@ if ( ! -e $warpbin ) then
-     goto errorsetup
- endif
- #
--setenv warpdoc ${arpwarphome}/manual
-+setenv warpdoc @GENTOO_PORTAGE_EPREFIX@/usr/share/doc/arp-warp-bin-7.1/html/
- set path = ( $warpbin $path )
- #
- # Settings for python
-@@ -58,7 +58,7 @@ if ( $status == 0 ) then
- endif
- 
- ##    2. Complement by other potential places for python :
--set search_list = "${search_list} /usr/local/bin/python /usr/bin/python"
-+set search_list = "${search_list} @GENTOO_PORTAGE_EPREFIX@/usr/bin/EPYTHON"
- setenv flex_wARP_python "/dev/null"
- 
- ##    3. Pick up the first one of the list which seems reasonable :
-@@ -82,34 +82,6 @@ foreach python_to_test ( ${search_list} )
-         setenv flex_wARP_bin ${HOME}/.flex-wARP/python-${pythonvrs1}.${pythonvrs2}
-         break
-     endif
--#        3.c Otherwise, we should be able to create the byte-code using the python.
--    /bin/mkdir -p ${arpwarphome}/byte-code/python-${pythonvrs1}.${pythonvrs2} >& /dev/null
--    if ( 0 != $status ) then
--        /bin/mkdir -p ${HOME}/.flex-wARP/python-${pythonvrs1}.${pythonvrs2} >& /dev/null
--        setenv flex_wARP_bin ${HOME}/.flex-wARP/python-${pythonvrs1}.${pythonvrs2}
--    else
--        setenv flex_wARP_bin ${arpwarphome}/byte-code/python-${pythonvrs1}.${pythonvrs2}
--    endif
--#    pushd ${flex_wARP_bin} >& /dev/null
--	set here_now = `pwd`
--	cd ${flex_wARP_bin}
--    if ( 0 != $status ) then
--        setenv flex_wARP_bin ${HOME}/.flex-wARP/python-${pythonvrs1}.${pythonvrs2}
--        /bin/mkdir -p ${flex_wARP_bin} >& /dev/null
--#        pushd ${flex_wARP_bin} >& /dev/null
--		cd ${flex_wARP_bin}
--    endif
--    /bin/cp -p ${arpwarphome}/flex-wARP-src/*.py .
--    ${python_to_test} ./compile.py
--    /bin/rm -f *.py
--#    popd >& /dev/null
--	cd ${here_now}
--    if ( -e ${flex_wARP_bin}/CPyWARP.pyc ) then
--        setenv flex_wARP_python ${python_to_test}
--        echo "Created a new set of flex-wARP byte code in the directory :"
--        echo "  '${flex_wARP_bin}'"
--        break
--    endif
- end
- ##    4. If nothing is available, print out a message.
- if ( "/dev/null" != ${flex_wARP_python} ) then
-@@ -127,16 +100,6 @@ else
-     setenv flex_wARP_bin "Unavailable"
- endif
- 
--#
--# Setting up library path for SGI
--if ( ${namesystem} == 'IRIX64' || ${namesystem} == 'IRIX' ) then
--    if ( ${?LD_LIBRARY_PATH} ) then
--        setenv LD_LIBRARY_PATH ${warpbin}:${LD_LIBRARY_PATH}
--    else
--        setenv LD_LIBRARY_PATH ${warpbin}
--    endif
--endif
--#
- goto endsetup
- #
- errorsetup:
diff --git a/sci-chemistry/arp-warp-bin/files/7.1-setup.patch b/sci-chemistry/arp-warp-bin/files/7.1-setup.patch
deleted file mode 100644
index 639e6621ad81..000000000000
--- a/sci-chemistry/arp-warp-bin/files/7.1-setup.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-diff --git a/share/arpwarp_setup_base.bash b/share/arpwarp_setup_base.bash
-index 29e769c..0b8a51e 100644
---- a/share/arpwarp_setup_base.bash
-+++ b/share/arpwarp_setup_base.bash
-@@ -13,10 +13,10 @@ else
-     identifier=${nameprocessor}'-'${namesystem}
- fi
- #
--arpwarphome="$1X"
-+arpwarphome="@GENTOO_PORTAGE_EPREFIX@/opt/arp-warp-bin"
- #
- export warpbin=${arpwarphome}/bin/bin-${identifier}
--export warpdoc=${arpwarphome}/manual
-+export warpdoc=@GENTOO_PORTAGE_EPREFIX@/usr/share/doc/arp-warp-bin-7.1/html/
- export PATH=${warpbin}:${PATH}
- #
- # Checks for existence of $warpbin directory
-@@ -59,7 +59,7 @@ if [ "$testccp" = '0' ]; then
-     fi
- 
- ##    2. Complement by other potential places for python :
--    search_list="${search_list} /usr/local/bin/python /usr/bin/python"
-+    search_list="${search_list} @GENTOO_PORTAGE_EPREFIX@/usr/bin/pythonPYVER"
-     flex_wARP_python="/dev/null"
- 
- ##    3. Pick up the first one of the list which seems reasonable :
-@@ -83,34 +83,6 @@ if [ "$testccp" = '0' ]; then
-             export flex_wARP_bin=${HOME}/.flex-wARP/python-${pythonvrs1}.${pythonvrs2}
-             break
-         fi
--#        3.c Otherwise, we should be able to create the byte-code using the python.
--        /bin/mkdir -p ${arpwarphome}/byte-code/python-${pythonvrs1}.${pythonvrs2} 1> /dev/null 2>&1
--        if [ 0 != $? ] ; then
--            /bin/mkdir -p ${HOME}/.flex-wARP/python-${pythonvrs1}.${pythonvrs2} 1> /dev/null 2>&1
--            export flex_wARP_bin=${HOME}/.flex-wARP/python-${pythonvrs1}.${pythonvrs2}
--        else
--            export flex_wARP_bin=${arpwarphome}/byte-code/python-${pythonvrs1}.${pythonvrs2}
--        fi
--#        pushd ${flex_wARP_bin} 1> /dev/null 2>&1
--        here_now=$(pwd)
--        cd ${flex_wARP_bin}
--        if [ 0 != $? ] ; then 
--            export flex_wARP_bin=${HOME}/.flex-wARP/python-${pythonvrs1}.${pythonvrs2}
--            /bin/mkdir -p ${flex_wARP_bin} 1> /dev/null 2>&1
--#            pushd ${flex_wARP_bin} 1> /dev/null 2>&1
--	        cd ${flex_wARP_bin}
--        fi
--        /bin/cp -p ${arpwarphome}/flex-wARP-src/*.py .
--        ${python_to_test} ./compile.py
--        /bin/rm -f *.py
--#        popd 1> /dev/null 2>&1
--		cd ${here_now}
--        if [ -e ${flex_wARP_bin}/CPyWARP.pyc ] ; then
--            export flex_wARP_python=${python_to_test}
--            echo "Created a new set of flex-wARP byte code in the directory :"
--            echo "  '${flex_wARP_bin}'"
--            break
--        fi
-     done
- ##    4. If nothing is available, print out a message.
-     if [ "/dev/null" != ${flex_wARP_python} ] ; then
-@@ -130,14 +102,6 @@ if [ "$testccp" = '0' ]; then
- fi
- 
- #
--# Setting up library path for SGI
--if [[ "${namesystem}" = 'IRIX64' || "${namesystem}" = 'IRIX' ]]; then
--    if test "$LD_LIBRARY_PATH"; then
--        export LD_LIBRARY_PATH=${warpbin}:${LD_LIBRARY_PATH}
--    else
--        export LD_LIBRARY_PATH=${warpbin}
--    fi
--fi
- #   echo
- #   echo 'ARP/wARP Version 7.1 has been setup'
- #
-diff --git a/share/arpwarp_setup_base.csh b/share/arpwarp_setup_base.csh
-index 41b11e9..a4edcff 100644
---- a/share/arpwarp_setup_base.csh
-+++ b/share/arpwarp_setup_base.csh
-@@ -13,7 +13,7 @@ else
-     set identifier = ${nameprocessor}'-'${namesystem}
- endif
- #
--set arpwarphome = '$1X'
-+set arpwarphome = '@GENTOO_PORTAGE_EPREFIX@/opt/arp-warp-bin'
- #
- setenv warpbin ${arpwarphome}/bin/bin-${identifier}
- #
-@@ -27,7 +27,7 @@ if ( ! -e $warpbin ) then
-     goto errorsetup
- endif
- #
--setenv warpdoc ${arpwarphome}/manual
-+setenv warpdoc @GENTOO_PORTAGE_EPREFIX@/usr/share/doc/arp-warp-bin-7.1/html/
- set path = ( $warpbin $path )
- #
- # Settings for python
-@@ -58,7 +58,7 @@ if ( $status == 0 ) then
- endif
- 
- ##    2. Complement by other potential places for python :
--set search_list = "${search_list} /usr/local/bin/python /usr/bin/python"
-+set search_list = "${search_list} @GENTOO_PORTAGE_EPREFIX@/usr/bin/pythonPYVER"
- setenv flex_wARP_python "/dev/null"
- 
- ##    3. Pick up the first one of the list which seems reasonable :
-@@ -82,34 +82,6 @@ foreach python_to_test ( ${search_list} )
-         setenv flex_wARP_bin ${HOME}/.flex-wARP/python-${pythonvrs1}.${pythonvrs2}
-         break
-     endif
--#        3.c Otherwise, we should be able to create the byte-code using the python.
--    /bin/mkdir -p ${arpwarphome}/byte-code/python-${pythonvrs1}.${pythonvrs2} >& /dev/null
--    if ( 0 != $status ) then
--        /bin/mkdir -p ${HOME}/.flex-wARP/python-${pythonvrs1}.${pythonvrs2} >& /dev/null
--        setenv flex_wARP_bin ${HOME}/.flex-wARP/python-${pythonvrs1}.${pythonvrs2}
--    else
--        setenv flex_wARP_bin ${arpwarphome}/byte-code/python-${pythonvrs1}.${pythonvrs2}
--    endif
--#    pushd ${flex_wARP_bin} >& /dev/null
--	set here_now = `pwd`
--	cd ${flex_wARP_bin}
--    if ( 0 != $status ) then
--        setenv flex_wARP_bin ${HOME}/.flex-wARP/python-${pythonvrs1}.${pythonvrs2}
--        /bin/mkdir -p ${flex_wARP_bin} >& /dev/null
--#        pushd ${flex_wARP_bin} >& /dev/null
--		cd ${flex_wARP_bin}
--    endif
--    /bin/cp -p ${arpwarphome}/flex-wARP-src/*.py .
--    ${python_to_test} ./compile.py
--    /bin/rm -f *.py
--#    popd >& /dev/null
--	cd ${here_now}
--    if ( -e ${flex_wARP_bin}/CPyWARP.pyc ) then
--        setenv flex_wARP_python ${python_to_test}
--        echo "Created a new set of flex-wARP byte code in the directory :"
--        echo "  '${flex_wARP_bin}'"
--        break
--    endif
- end
- ##    4. If nothing is available, print out a message.
- if ( "/dev/null" != ${flex_wARP_python} ) then
-@@ -120,6 +92,7 @@ else
-     echo "WARNING while setting up ARP/wARP"
-     echo "No valid 'python' command was found"
-     echo "flex-warp ('ARP/wARP Expert System' in the GUI) will not be available."
-+    echo "Did you upgrade your python? Please run 'emerge sci-chemistry/arp-warp-bin!'"
-     echo
-     setenv flex_wARP_warpbin "Unavailable"
-     setenv flex_wARP_cbin "Unavailable"
-@@ -127,16 +100,6 @@ else
-     setenv flex_wARP_bin "Unavailable"
- endif
- 
--#
--# Setting up library path for SGI
--if ( ${namesystem} == 'IRIX64' || ${namesystem} == 'IRIX' ) then
--    if ( ${?LD_LIBRARY_PATH} ) then
--        setenv LD_LIBRARY_PATH ${warpbin}:${LD_LIBRARY_PATH}
--    else
--        setenv LD_LIBRARY_PATH ${warpbin}
--    endif
--endif
--#
- goto endsetup
- #
- errorsetup: