4 files changed, 23 insertions, 155 deletions
diff --git a/sci-chemistry/gsim/ChangeLog b/sci-chemistry/gsim/ChangeLog
index 470632c165ae..09b6c480b9d1 100644
--- a/sci-chemistry/gsim/ChangeLog
+++ b/sci-chemistry/gsim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/gsim
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gsim/ChangeLog,v 1.11 2013/11/09 11:23:26 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gsim/ChangeLog,v 1.12 2015/02/20 09:09:03 jlec Exp $
+
+  20 Feb 2015; Justin Lecher <jlec@gentoo.org> -gsim-0.20.1.ebuild,
+  -gsim-21.0.ebuild:
+  Drop old
 
 *gsim-21.3 (09 Nov 2013)
 
diff --git a/sci-chemistry/gsim/Manifest b/sci-chemistry/gsim/Manifest
index 4719870e690c..0d1214f97370 100644
--- a/sci-chemistry/gsim/Manifest
+++ b/sci-chemistry/gsim/Manifest
@@ -4,28 +4,26 @@ Hash: SHA512
 AUX 0.20.1-build.conf.patch 1890 SHA256 e5949f23eeab361149b4455b14d492f7e6f2c65f9ae6b816935c64e91aaa668b SHA512 98518d85fb45cc72a99d0e2dd6776aedb98183d89c96aa0bf029800c61d956d4720d97b42af53f12b5430200d508a1b4c85b427c849438d97f96a3d726d7b9a9 WHIRLPOOL 5da45c5bd7c38a6040117743f1e54234cf5b78879b6543d3d7c2286e7a084cdff0ac8e4a73ffe828c0b152f3be903713a40212f6edb6c863efaab4ac6eba0306
 AUX gsim-21.0-build.conf.patch 1671 SHA256 ccedea334a9a736c6547ff4a4c98e5bffc54764659916bdaeaa0e63014cce14d SHA512 9f351688d3b76b561f7c7c746cae7b5921b2c06c0d31f706403e89cc4b89d0ceea43058f8ebb7e7af4cb802972aa025a5c18d9d8140bfe01fedd3d437a1b8b6a WHIRLPOOL 4ff15bd9a32ecee3a3102c6e141b683e47751da4e3689aee8d601578f85b87fb7fd6cdb60fbd55ac10992ae8fa9deb763bb32b0686716644763b0d24c1c7f1ae
 AUX gsim-21.3-build.conf.patch 1897 SHA256 565b9db57e8525ad4b3bc7e9d445cd54d282500d5f7e1beb0cef31db2da1bacb SHA512 d1bd0fb6ce8279edfa5aff48ce9d7174825c17531b6d71b5fa872b744160d9c836f80c751e184b34308b05e1f7a817c4fd6b9071bab7e874ca2d59280adc8312 WHIRLPOOL dd9ff16c359e9f7a2d88b9f193c0d646a6be1e724d310e903b0d8188f0c4f935f77335b03dfcaccaf66ab2dee4e4d98f06c358c46c266770e7615aa59b430d30
-DIST gsim-0.20.1.tar.gz 6088362 SHA256 0a63c52e3dc14450a3c58fb59f8dd51dfd5c685d2c7ef8f5448760c0b571fe7c SHA512 c67cbbb2451bac1e81c120f75ca5b5d5021bb85296a708db2f8db4716d4cabdd51a87e36ea1f3602bad410af9382ffdb28fc2707f3a7f350823740d30fb3ef58 WHIRLPOOL dfdda0ab8cada12fd6c866da89e43b18df599c46a0fc2f6b7e38e42219006a6b6b209f6b9b569fea66efbae2eabfe65d0b57c4c3b3d31f49d1c1a80d03619d07
-DIST gsim-21.0.tar.gz 4103931 SHA256 4e18b9372dc618b97399be2bfea7c39ad4e96dd76eda0bbf201ca1581a054493 SHA512 f650e558761edb9d4f6590c1bcc1ca2d3ee80a0a6a88df2af9be86fd2162340f28c12a77c5a31e63e111459e757ef1093b8efa5ffba897e7fe74f4a0a17bf8f9 WHIRLPOOL 19935caa4f5d296849bec51f8f82a31cc592662c310820f65253f1df393078cfda9b8c1a01e88c99f83ab14848f5dbfb5423aa4c8ce68fb2d6d434e99dfc0270
 DIST gsim-21.3.tar.gz 4100589 SHA256 d3dd161078862fa990b40ff5df988bb82c8469e17dda8e81eda5f1419742de47 SHA512 0a65ec416a11893fe9f249126ed8e7b9f7991dc8f02d6b62b01962de6dfabda805acdc3d7fc6939b609ff018f16cefff616f37ee906776712209460374bb225d WHIRLPOOL d8dde220a52608b5dc48e494fb1b0bad49f13f770e132641b9671cd544c951cdd03a4578bf983492dfb0b74567e51ef716ecbb828ba40b2a3385d26788b83bea
-EBUILD gsim-0.20.1.ebuild 1698 SHA256 3be415a94c32039e9c1ba3791df75497bb522bec9326309b507b0e33079b03f2 SHA512 01fc8d53d068fb01058f99687941ff0fee6dc3d5cd92019918c561ab22d1c040182c782950c8883d580a80d2c4f24078c72b6c4a5357e934e44e364134d9a7d0 WHIRLPOOL 0a92caaf6e4f6bc398b1903e7999192a3bbdcd3b44545ccad72a2da98383e44832185d677b3f3a169fb82a922607b6ff418ff7977af9de73fcb975cd42ab3b94
-EBUILD gsim-21.0.ebuild 1691 SHA256 05b5ef349be00fe511557f81a7f5111b27d85eba8d932192704972632bb2db59 SHA512 9eb1e10a547ee8baed2823d8c3ab8fd907eaeff0b6d7bf2344cfe585e381e32551a4a64bb5dcd0bfd7d9abd683f8d018b5d60beda1c5f33336a7710715ef7e37 WHIRLPOOL 29edc35f2286dae6fbf0a7e5bd73b9ac0f59e0e29b079cf133484c442fda33e2194cabd6dfc88e7e135b523fc2c6e589c90a973c29401d19027e922518ebc604
 EBUILD gsim-21.3.ebuild 1691 SHA256 5db0b37d176af74afcca86e551a4e882bb653b538857776dcbd68839b5f84522 SHA512 ef86e070e71d0b631264a3e114c70d1b16f235a1aa1f1c70ffc9361dc5246d8a7ea10215a8d0c604558d3dbdca1b2da89f65c732daa1241d79163b6dc6fa3d25 WHIRLPOOL 6f839adf0235d1f5723f6bed0cb460fa326a32d457fb324623488e01cb3e5ecdad42604d21a06ba367f736877d56c3b31f785fd04311eabb9afb5f8691256a9a
-MISC ChangeLog 1746 SHA256 67b8247e399a45ef5f936928072b7f3ffbecfae3f2add157d93d613347a56d3c SHA512 fdbb5033fff352488087c444ac7ef74b78cf3fe235efd3d1d03d50c66845ef45b6201de869a4bcc0af555a43c9c2776e8562ff0731c43683b4a37536a8dbf3fa WHIRLPOOL db540a17dd20fe39a7b6065b8295c03b2a1812b13159ce33c9a81cc60bd740b6c2cb1ac52688c209c3f2ee4861414babaa5569d7552b3f1feaf992bd7b6ba1c6
+MISC ChangeLog 1847 SHA256 8e2c754a0f96a953b7cb82c02196275e14594970e2863f89ec0f12954eccc3c1 SHA512 a598bb6d59ca9b09e13a9be7a8fdd6293585611f33f0750ffc5c5def759eb66e1e623e973af008b697f4a2090d1605855734e37296e21952e837d273e8f843ff WHIRLPOOL e3a0afddd16fee9fafcd3a04009a12eb23a5863eb229afdf973f78d502ca9b0a6007d4ff480ab22f15d6f02296a6a72dbfcb028c28f7a47c70ed61b34c098f03
 MISC metadata.xml 303 SHA256 29af76dea3adb8a70664e5f21d44baf85c51b2dcb8a6f96fb23e05f5336287cc SHA512 0a06bcdb1ff8255fe3fa51f539e589808b34415c5c6258549024a3b4ef5653c98e9e8e76ea993f6d25277379ab0795e4938c63e08b79ad705fea7e7f7a6ee51d WHIRLPOOL af71c256c9d4d722cf6eadbf37f629762fec4ed1c787837aa910c6734995f1e122cb545f33f6ea9e8257b5a554c9fedde5e8f63d1b5d7463ed4e7c2d85899cbe
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCgAGBQJSfhsvAAoJELnU8jG9FVirzYQQAKO0vPwuEiYZGCI1KDre5eyv
-YOBDvfDgWXiUA8VQ8GUiC+nrrJII5nn+4MjJJ50bPMm7QG31pR7FBLMBjyaUz+Ii
-Ig8ZYQoaTJN9vKcRWi20VfzkbPWAfloVkdga1rDwriiXABmdiXml87GEP5FR47Cy
-6bNkITcezKuG+Kaq/8DKL+JyaJDDEFknA4YiN4pFN7/jRhnkaNawDB89db5cNOEC
-z3Gy1VSD72g1isUodMFaQ4sKyBBvhlhqsZSGtad84jHUGdx6dh8HRTrBF2b1IQ90
-cv/AuCEH0NLLMv8fXQzoHJ798tbBDFdot+QVMIMhUV0AKaS0yRb7NlhBtkDXjf8G
-WuWUCpLz4kGwtwKmznORlfcpTKzWv8Ugeqy7Bu9GBi2Hr0lojhluHVecqFgaaqGz
-WRVrE35cvBd/whTKzSlO7WJR74h6W2RNBXPu+v0nykZReJHkS/RF4E4jb1EMqHjM
-TtUsrgiSqwp1ZmfaiGZYG3lyjyKYUhm5RdJNn3lO5RWkA69a1CpRutcQSFaiNF3J
-ot6wHflJIKMNNL7rcpLpNt311KPui70HAoJhgTGzhH6/wVMpGJI8cyBUqxcavMlX
-JA+9x9bJUtY54snF1R8h7i39sgr72lczxQBU92oXmLtY4U8kKrxQwHyWzv+mMiMN
-yVhGeEo4MgwA8WlkMaml
-=HuQf
+iQJ8BAEBCgBmBQJU5vmwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir7KwP/RjQExNqXV2m/9cl1u4NWdHS
+kFjg/2wnIu05I7AIZyrL/g9wZ422FV+EFRwbkFNRRqmvDE9NFyzpqGe6Vp4tW1UL
+lzfFuxTMgsi49p9mMuhBymqa28XGXgsy7ZCSBibavaETf0WGZfnXgXzhUuyS30cF
+tuuL+S82Amqh0moweKHZsqMfZJ/0CNZhCin7OkSyfLiElmWePoTKq3KJ3AJ7nM7J
+Et/OaR129JWIvGbhp8P5a66XNeZDGObFqhLJi1sSb+eyG9X7c5sVmIzeYLlLcTwP
+wdm8gQweyiYeXEDOyFyqRZ8wuKEYMxeL0KqZycz8oWnp7LuVz4YbUROusPPZHdo9
+XvONBWkbvmAFaT8PtAPj6GOVioZ0fLRRqvjYGMvPtxEHAX3g8WPBXCK6oyNjNm4u
+dgm7OXo0WOx6K0HDzIKDpgqgIJKn6Qh9RUQC13ujXycXqZCURyAiH0K2pNDQIZlD
+k4cjJQRZG2UcZtB1+GIF9jd7IRzKzR+Xc1Hw/uWd8vQZ9DlLu/fisr3kFahzw+3o
+U6XPgnK+MbpONnCvsdrsoEhA/AT3NeTiH4f20LbQdLDB3aoT4JsXzfj3TH5ck4u9
+p7E8nt3i9VBwJfH8WD5cDsdfhJOCLQH80Fd/dOer9gqD2eu8b95cKGycsLa7Vob3
+qEmLQGMR2h7k67L76dm2
+=DzZf
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/gsim/gsim-0.20.1.ebuild b/sci-chemistry/gsim/gsim-0.20.1.ebuild
deleted file mode 100644
index 6d62b71789d6..000000000000
--- a/sci-chemistry/gsim/gsim-0.20.1.ebuild
+++ /dev/null
@@ -1,67 +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/gsim/gsim-0.20.1.ebuild,v 1.5 2013/03/02 23:17:52 hwoarang Exp $
-
-EAPI=4
-
-inherit eutils qt4-r2 toolchain-funcs
-
-DESCRIPTION="Programm for visualisation and processing of experimental and simulated NMR spectra"
-HOMEPAGE="http://sourceforge.net/projects/gsim/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="emf opengl"
-
-RDEPEND="
-	dev-cpp/muParser
-	media-libs/freetype
-	sci-libs/libcmatrix
-	sci-libs/minuit
-	virtual/blas
-	dev-qt/qtsvg:4
-	emf? ( media-libs/libemf )
-	opengl? ( dev-qt/qtopengl:4 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PV}-build.conf.patch )
-DOCS="release.txt README_GSIM.* quickstart.* changes.log programming.*"
-
-src_prepare() {
-	edos2unix ${PN}.pro
-
-	qt4-r2_src_prepare
-
-	cat >> build.conf <<- EOF
-	INCLUDEPATH += "${EPREFIX}/usr/include/libcmatrixR3/" \
-		"${EPREFIX}/usr/include/Minuit2" \
-		"${EPREFIX}/usr/include"
-	LIBS += -lcmatrix  -lMinuit2 -lmuparser $($(tc-getPKG_CONFIG) --libs cblas)
-	EOF
-
-	use opengl && echo "CONFIG+=use_opengl" >> build.conf
-
-	if use emf; then
-		cat >> build.conf <<- EOF
-		CONFIG+=use_emf
-		DEFINES+=USE_EMF_OUTPUT
-		LIBS += -L\"${EPREFIX}/usr/include/libEMF\" -lEMF
-		EOF
-	fi
-	sed \
-		-e "s:quickstart.pdf:../share/doc/${PF}/quickstart.pdf:g" \
-		-e "s:README_GSIM.pdf:../share/doc/${PF}/README_GSIM.pdf:g" \
-		-i mainform.h || die
-}
-
-src_install() {
-	qt4-r2_src_install
-	dobin ${PN}
-	insinto /usr/share/${PN}
-	doins -r images ${PN}.ico
-	insinto /usr/share/${PN}/ui
-	doins *.ui
-}
diff --git a/sci-chemistry/gsim/gsim-21.0.ebuild b/sci-chemistry/gsim/gsim-21.0.ebuild
deleted file mode 100644
index b7b56bf05b39..000000000000
--- a/sci-chemistry/gsim/gsim-21.0.ebuild
+++ /dev/null
@@ -1,67 +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/gsim/gsim-21.0.ebuild,v 1.1 2013/03/06 14:26:39 jlec Exp $
-
-EAPI=5
-
-inherit eutils qt4-r2 toolchain-funcs
-
-DESCRIPTION="Programm for visualisation and processing of experimental and simulated NMR spectra"
-HOMEPAGE="http://sourceforge.net/projects/gsim/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="emf opengl"
-
-RDEPEND="
-	dev-cpp/muParser
-	media-libs/freetype
-	sci-libs/libcmatrix
-	sci-libs/minuit
-	virtual/blas
-	dev-qt/qtsvg:4
-	emf? ( media-libs/libemf )
-	opengl? ( dev-qt/qtopengl:4 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-build.conf.patch )
-DOCS="release.txt README_GSIM.* quickstart.* changes.log programming.*"
-
-src_prepare() {
-	edos2unix ${PN}.pro
-
-	qt4-r2_src_prepare
-
-	cat >> build.conf <<- EOF
-	INCLUDEPATH += "${EPREFIX}/usr/include/libcmatrixR3/" \
-		"${EPREFIX}/usr/include/Minuit2" \
-		"${EPREFIX}/usr/include"
-	LIBS += -lcmatrix  -lMinuit2 -lmuparser $($(tc-getPKG_CONFIG) --libs cblas)
-	EOF
-
-	use opengl && echo "CONFIG+=use_opengl" >> build.conf
-
-	if use emf; then
-		cat >> build.conf <<- EOF
-		CONFIG+=use_emf
-		DEFINES+=USE_EMF_OUTPUT
-		LIBS += -L\"${EPREFIX}/usr/include/libEMF\" -lEMF
-		EOF
-	fi
-	sed \
-		-e "s:quickstart.pdf:../share/doc/${PF}/quickstart.pdf:g" \
-		-e "s:README_GSIM.pdf:../share/doc/${PF}/README_GSIM.pdf:g" \
-		-i mainform.h || die
-}
-
-src_install() {
-	qt4-r2_src_install
-	dobin ${PN}
-	insinto /usr/share/${PN}
-	doins -r images ${PN}.ico
-	insinto /usr/share/${PN}/ui
-	doins *.ui
-}