11 files changed, 21 insertions, 278 deletions
diff --git a/sci-astronomy/cpl/ChangeLog b/sci-astronomy/cpl/ChangeLog
index 31d37ed2fb40..63154af509a5 100644
--- a/sci-astronomy/cpl/ChangeLog
+++ b/sci-astronomy/cpl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-astronomy/cpl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/cpl/ChangeLog,v 1.13 2013/06/07 23:32:10 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/cpl/ChangeLog,v 1.14 2013/06/11 17:40:51 bicatali Exp $
+
+  11 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org> -cpl-6.1.1.ebuild,
+  -cpl-6.2.ebuild:
+  Removed old
 
 *cpl-6.3.1 (07 Jun 2013)
 
diff --git a/sci-astronomy/cpl/Manifest b/sci-astronomy/cpl/Manifest
index 6dde8cfe5517..0a72c696abd8 100644
--- a/sci-astronomy/cpl/Manifest
+++ b/sci-astronomy/cpl/Manifest
@@ -3,18 +3,14 @@ Hash: SHA256
 
 AUX cpl-6.1.1-check-shared-libs.patch 1010 SHA256 99d448ed80ad6139bb989ffc718942570dc8c2646e3936939c9fb6797deb92a5 SHA512 40d060e441222328e92508eef25fa50eea37600d4bfb9f422d47e5cafac115a9e82994ff74e3ca17124b5b83d8cec19b2f681709dbfc1ec975841a74fd273903 WHIRLPOOL 23fc6e83b59e6c10e512d93bde8ff2d62c5bc4a1b3390dea163e6c94f03bc2eb21fe3db12a61d3d869d71f59493f77ff6fdcab416ff564542d436b7850e9a7ad
 AUX cpl-6.1.1-use-system-ltdl.patch 1296 SHA256 55bd2aa8072e621d6a7e4e939f8e6831c598c7000f739756520ff174e1d6ecaf SHA512 bfa2d0f6cadcf7e817314a6a3d587f99b298ea7f1fd919f5c7ef6a4a133a631da7a039f77f572918029ee8284d025a808ff3851112e5836ab824afa5e519ac1e WHIRLPOOL a1ee4c34fde903f14f6805cb312951ead0fa3b1bfaf9b78abbad4e4063d2f15def568b24401695ceeb0613fce933f5fba7cb239d6933b4d5cfeb262fd0a5b1a0
-DIST cpl-6.1.1.tar.gz 2846557 SHA256 74250d8459dcee4a0b814488d3f0f5691bf9888fde3931b66033673575eb95e7 SHA512 1b3156091e1f560d8e24182421fd058772817c057adae479a839007d56c2c887ffa409f31d76120d0ccb06f5ff0260e1d5d2d94d4dd2769768894db1af0e0832 WHIRLPOOL dedaa385c92c4276d745aa163b89061d9d0cf416f73081327e2009afaed4f7010f10b13c30b23d6e5d1a0a8d4e2e5e6fc05bbccc8d2cc5284b275729bf425a85
-DIST cpl-6.2.tar.gz 2909445 SHA256 cd756302ee3990221031b34d343457ea1c4952de968c8b5c74b3830c7021426f SHA512 1ebda47d8784a65e64bbbf219d3d2e7cf1a6c050dfb290fa9dd319597fbcc405bfd14962bf6994d0a720194e4b979bdc5e7c1db439b994158831f6be6cf380e4 WHIRLPOOL 68fc331e7b48722e4b05254dab35b3033e431ca8d79a0fe82a9e593cb4f97c766ed62fa422b0b8769169f6323737403e462070850931d28daa80e2dbaf261882
 DIST cpl-6.3.1.tar.gz 2981414 SHA256 457d54d01cf356e9898fb2f226f057099a481e183a2eaabd34a7b4c865e10089 SHA512 b597968978ca87048b25ee7fd8ff6ebb483e1fd4c6c4fb515720bf468fe67e7b8a25cc9bf7141c18520ba37dcde9654bd5b46d9adcacba8b51780ff671bcdf76 WHIRLPOOL 1f5c224daaa79c689196cfdf2825574881f060d0e5c2ea6c48937a33c5feaec404f30c5f0abf48d352f0240255accdec1223a9c7b11b93b410f1d5e38a8c7e96
-EBUILD cpl-6.1.1.ebuild 1677 SHA256 38c8ff4d1a0463f53221bab84224e2d60c7ec47f9ab238d25b81b6846d2ddffd SHA512 2e1b475fc1a852764ec578de0aab859c7d39aabcab2c01444ba5c59586e2ba01b9a8f8022d1cffc391c78dee4be814cb730ac913af39f0571471c4affb5e8c37 WHIRLPOOL ee55d2ac67ef6ac65c61209419312581867d48cc2c398a2dc533a8a07ece6a744b027c24d8b3b78d312e9c88c070d669566483ca6e1a2f702f1df28e6b4ade6c
-EBUILD cpl-6.2.ebuild 1748 SHA256 08f5093317bd9120f77f1a0604cdb6e62ca4281785ff5c803768b2d5f8b958a7 SHA512 6f95f8b6782cb5dca88fa1256a67193b9000b9bf6c6e761f8fb40563aae252ce07a94e894b7062d2d3bf862eceb837b0000fa26c75c779e99d38044d4c5f88a1 WHIRLPOOL a37dd32de3e7f0b942d0796dcbf5e174adf0de0d2c388a4ba66150aef95b55735789a88d7ea87ad193f7531107dee5e6f6297495886482cd1f8063b653d3e17b
 EBUILD cpl-6.3.1.ebuild 1845 SHA256 f0b0fdd626bac3d0c5177e43b70d60c12192eb7f00ab3dce5a54093edef3cc9e SHA512 c654dfd50161710ab3188271b4256535280e08eff26eab652722d349387f3f8b65a6178f9fae232189fceb9c0d0cc5c993a2b0cb8ff8345163973020e220ded7 WHIRLPOOL f4e72aefef3aa09985d333a097f2ab8ad4012deacce8a72295bd5f56bc6b2b208fd868fcdd37d28624d6c52db46576a919e386852902ec175ce60a96cc24571b
-MISC ChangeLog 2904 SHA256 cb3103f726f880f3eb1c18c382f397f7ffc95f8313a8be1c2117b776f45152d8 SHA512 3e2794fee358d4f85d3f5f0150df4c3dea37fdeb55dd893d2235ca2ee6779bd1bc96d6ba8809841889667b0a0f3e959efb05793815795e98aedb9382e5a9f0eb WHIRLPOOL 561b367a020d4eb6f85272835933a3d10a33c2f2fa2daad0474df6119bda003bf4c03688539fa547819737fb8b4c31691aafe2d4dcc52fee57b680f6a7db14a3
+MISC ChangeLog 3012 SHA256 449268c2b20f5557fdde1f041a75a33429545906584036a15b227be3658a11e8 SHA512 893279f03843beee1f9c65b5ef663d6eb9cac49f6539a60d2df0da36c48d69e9a55ea2a2ae4a493e965f4b31820968f7fba6bcbff2aea881054453f62639d8fa WHIRLPOOL 36f462cd156d0aaed5baaa2306fdcc264fdda41342cf65e46663ccb095dc3c617ddab2770ec17fbd618f02dfcd08987ec7ce10e1e12372dc716b5f91f71fc653
 MISC metadata.xml 979 SHA256 37431826b0c9d429427342e34cc1dc25535068b13d2875ea24dc4156fcaa879e SHA512 15e281ea3ebc94ba0a94dd8a5825515aa6fdd70995e2a4c85da8bb27188d542f68defe8098fe3d7258c8525f19e1799b1ffe266db731d6b5c3ff6290241baf53 WHIRLPOOL 3b76dbc1ea968a4717d46da67c4505e62e6e8d4ea6138eb71eab9223cc4eb3083ff9dcb810d4285f4dd75f07c3698b7a8da2d31ba6d555c9ac99cefdc3c4cd2e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlGybYAACgkQ1ycZbhPLE2CEQACePYbtqMxvQKEeYun+trlg4Ws/
-YYQAn3Wkwk/vlyMRdw+OpocHz/l9D7VF
-=p2wq
+iEYEAREIAAYFAlG3YSQACgkQ1ycZbhPLE2AZ6wCfRICQ7WOCtwX/LFrluko5imEo
+z1kAnRpjHrTXcNHamuqoROL5CsDkpmj/
+=0vXJ
 -----END PGP SIGNATURE-----
diff --git a/sci-astronomy/cpl/cpl-6.1.1.ebuild b/sci-astronomy/cpl/cpl-6.1.1.ebuild
deleted file mode 100644
index fa1bbf82d358..000000000000
--- a/sci-astronomy/cpl/cpl-6.1.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/cpl/cpl-6.1.1.ebuild,v 1.4 2012/09/06 16:34:35 bicatali Exp $
-
-EAPI=4
-
-JAVA_PKG_OPT_USE=gasgano
-AUTOTOOLS_AUTORECONF=1
-
-inherit eutils java-pkg-opt-2 autotools-utils
-
-DESCRIPTION="ESO common pipeline library for astronomical data reduction"
-HOMEPAGE="http://www.eso.org/sci/software/cpl/"
-SRC_URI="ftp://ftp.eso.org/pub/dfs/pipelines/libraries/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="doc gasgano static-libs threads"
-
-RDEPEND="
-	>=sci-astronomy/wcslib-4.8.4
-	>=sci-libs/cfitsio-3.270
-	>=sci-libs/fftw-3.1.2
-	gasgano? ( sci-astronomy/gasgano )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-check-shared-libs.patch
-	"${FILESDIR}"/${P}-use-system-ltdl.patch
-)
-
-src_prepare() {
-	sed -e '/AM_C_PROTOTYPES/d' \
-		-i configure.ac libcext/configure.ac || die #422455
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-		--disable-ltdl-install
-		--without-included-ltdl
-		$(use_enable doc maintainer-mode)
-		$(use_enable threads)
-	)
-	if use gasgano; then
-		myeconfargs+=(
-			--enable-gasgano
-			--with-gasgano="${EPREFIX}/usr"
-			--with-gasgano-classpath="${EPREFIX}/usr/share/gasgano/lib"
-			--with-java="$(java-config -O)"
-		)
-	else
-		myeconfargs+=( --disable-gasgano )
-	fi
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile all $(use doc && echo html)
-}
-
-src_install() {
-	autotools-utils_src_install all $(use doc && echo install-html)
-}
diff --git a/sci-astronomy/cpl/cpl-6.2.ebuild b/sci-astronomy/cpl/cpl-6.2.ebuild
deleted file mode 100644
index c2874e01c2a3..000000000000
--- a/sci-astronomy/cpl/cpl-6.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/cpl/cpl-6.2.ebuild,v 1.1 2012/12/05 17:22:29 bicatali Exp $
-
-EAPI=4
-
-JAVA_PKG_OPT_USE=gasgano
-AUTOTOOLS_AUTORECONF=1
-
-inherit eutils java-pkg-opt-2 autotools-utils
-
-DESCRIPTION="ESO common pipeline library for astronomical data reduction"
-HOMEPAGE="http://www.eso.org/sci/software/cpl/"
-SRC_URI="ftp://ftp.eso.org/pub/dfs/pipelines/libraries/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="doc gasgano static-libs threads"
-
-RDEPEND="
-	>=sci-astronomy/wcslib-4.8.4
-	>=sci-libs/cfitsio-3.270
-	>=sci-libs/fftw-3.1.2
-	gasgano? ( sci-astronomy/gasgano )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.1.1-check-shared-libs.patch
-	"${FILESDIR}"/${PN}-6.1.1-use-system-ltdl.patch
-)
-
-src_prepare() {
-	# bug 422455 and remove cpu chcking
-	sed -i \
-		-e '/AM_C_PROTOTYPES/d' \
-		-e '/CPL_CHECK_CPU/d' \
-		configure.ac libcext/configure.ac || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-		--disable-ltdl-install
-		--without-included-ltdl
-		$(use_enable doc maintainer-mode)
-		$(use_enable threads)
-	)
-	if use gasgano; then
-		myeconfargs+=(
-			--enable-gasgano
-			--with-gasgano="${EPREFIX}/usr"
-			--with-gasgano-classpath="${EPREFIX}/usr/share/gasgano/lib"
-			--with-java="$(java-config -O)"
-		)
-	else
-		myeconfargs+=( --disable-gasgano )
-	fi
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile all $(use doc && echo html)
-}
-
-src_install() {
-	autotools-utils_src_install all $(use doc && echo install-html)
-}
diff --git a/sci-astronomy/esorex/ChangeLog b/sci-astronomy/esorex/ChangeLog
index 73f4766e3901..3e124fd096f8 100644
--- a/sci-astronomy/esorex/ChangeLog
+++ b/sci-astronomy/esorex/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-astronomy/esorex
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/esorex/ChangeLog,v 1.8 2013/06/07 23:38:01 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/esorex/ChangeLog,v 1.9 2013/06/11 17:43:53 bicatali Exp $
+
+  11 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org> -esorex-3.9.6-r1.ebuild,
+  -files/esorex-3.9.6-autoconf-26.patch,
+  -files/esorex-3.9.6-move-rcfile-to-etc.patch,
+  -files/esorex-3.9.6-set-default-plugin-path.patch,
+  -files/esorex-3.9.6-use-system-ltdl.patch:
+  Removed old
 
 *esorex-3.10 (07 Jun 2013)
 
diff --git a/sci-astronomy/esorex/Manifest b/sci-astronomy/esorex/Manifest
index b950df7924bc..e33f452d745c 100644
--- a/sci-astronomy/esorex/Manifest
+++ b/sci-astronomy/esorex/Manifest
@@ -1,21 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX esorex-3.9.6-autoconf-26.patch 257 SHA256 1aa15f008afe5b648774bb3101e78b951b6e9c3f35945e8c15005c3eaf65f9d2 SHA512 f073545898b4825d5d0aef7432dff09c8f21dd72530ff007bb5d26ae40a7cd4e04a1b388526180081d4166230bcb4a2d16694a8cca4be1478cd879279399b017 WHIRLPOOL 447be9bf5e0daadb440a418ddd581236417d67c7eecb856cfd25068f835a9ee7eca8f33e0c5826e2250a406f40be7069211a03a20a75a1a6917b6a82f2ed486d
-AUX esorex-3.9.6-move-rcfile-to-etc.patch 373 SHA256 ccb1719c1d162dfb68132267af042512706898d02b2ae32fe13ecb55352655f4 SHA512 2e36065f806d141fe50c920659801ff4566e08346cacb41d3ad8255f9f097409081e14463609dfc52b8ef4c87cbc7bcdad01221e34d564cebe11b6e834c2520c WHIRLPOOL 21b0328176ad758c1ce88271e20441abea4646fd88f0123d56792255d7b6121517b7fb53373127ca469b4b4332892a2f63d58a9804dd7946d11f3188229ea749
-AUX esorex-3.9.6-set-default-plugin-path.patch 645 SHA256 66b7f5837175c8141aa6b932cf766ef86b8b91737104b16f5062cfda57e48693 SHA512 2da57f2b5dd495ca1db482221aae1e15663c75fc37e74b34a36862cb3473bd6892736fed5b0a0afb66f0e5f822abfa0d4973ab444cc3aea6fc5a9fde03bad9ba WHIRLPOOL 67ae01f6117c05e74c0ec49ebcfcb3da58dcff403bd4aa7c32fb880ff6c360afc3b6a4733451548cb8f7d8f4895e74dfbf8426e7dcaa43355063d03247135493
 AUX esorex-3.9.6-use-shared-libs.patch 562 SHA256 1a8922317e93d5840144b79d84e93b7ca329da9aa0e1872ad3493913e6975e90 SHA512 224ddaa94e1d7f105634f53b4238176ff84b2df0ebbfbfe8470fcb30182b4b3aa874ce002d98275488cf38128586e7dc7da0e26729db748e843ce661fa20930c WHIRLPOOL da69698daaf93607e8a4542dc35c2aaeb6b1327139927276bebca72e4788110c53e3b1aa88e7495b23ec4a1ba75fca1ce2efa34f82a4469a1366d7a393b96884
-AUX esorex-3.9.6-use-system-ltdl.patch 1010 SHA256 ed35373a55c0113c0711c44f36c33242090ba5a05a2d2449894b195793f96a99 SHA512 56613f99ebfebd9104c5466981fc6fcdc7072701dea66a4be57ad10a009952db11e14ec547092cef3c892032b14d1083471fb2e1aea5c2c9c40de21e632b9492 WHIRLPOOL 8a9e19226c1bf7761e50ccc8ac95de5c1bb6650f754a2b2602eeed738aad357b9e745e7f91a058cf064830723c9146465152698560fa573d01a4ccdae05d1ada
 DIST esorex-3.10.tar.gz 817307 SHA256 72ff1d26a45d7e926b1f4f74f1f286c8feb142dba7b0b5bb717c6286644f9494 SHA512 985a906418488fec46fc939bf64b40330ae829771860a36a40240b703f6f6f89f3da6701ee4ceb8c6d2c0b478004596dce4dbc11389937e75ef02d9ecb4c3d16 WHIRLPOOL ef368d35f5145b5626c88d6d4af7249889cce1ef901c67318d1f06f9baa7a0411c87917969261c0a268a06e5fd0dafd30701f49394cb82671f8c9ce282bc4768
-DIST esorex-3.9.6.tar.gz 799988 SHA256 9adba0f8c712ffa5f6b553618e927197e25bb71b4d2ab7b5e64482aea269a0ac SHA512 2b938a94f7a767926fa450a87e8364ca9d75053ab6796382c7eec48d09ea9ce70f6384c29f9605915ad43b35afde6873ad01f5b44f3afcde352466e5fbcb2d69 WHIRLPOOL 7dc56e996d06261743edfc4afda98506a6a2f5045206a2024da2d5a0a1f667a2f98158b6ced65391dadef0fc7ffe8b6b94c370dd97261c789360676253ad4075
 EBUILD esorex-3.10.ebuild 835 SHA256 de89161eaee83613d59567cd9992fd5c307700bddfb4738177436b23dabd633e SHA512 ed635437b918ab69c605297c82d26e23aa0c1ba2345c6349df623d9707310cffa54a89bec6abcdeb95ad9206deff3341e87073970594676e8d80458575fb27e6 WHIRLPOOL 8b4f09748c5dcf09f07a5dae766409295f09a93da9a58e46c1c079b923e5d0d8b8ec6b97123d4834d1f666653dcf5c97d934df2c73d6ff38dbfb69dc09476935
-EBUILD esorex-3.9.6-r1.ebuild 1006 SHA256 af026121ae7482baead674c4e3a60540460103e7b080678d69b39e28026be528 SHA512 19486b25215baca34b94e16416aec84901a1b4321f7eed731559dcce184198ca1cfba09d8ff51fc3bc25c5b4b9ecef72b0cfe6c4ef0a758611e73608b17b1e21 WHIRLPOOL 3875c18d616d02f9dcb582ca129917daef463d7bb5bef4f441bfb5c4795a092bade688bacc9fd737a3894f8accdb8d2b941877e755f39450302844199a20d28c
-MISC ChangeLog 2415 SHA256 d48e4fee271213ec090ba625f20d4148e9dc436c946fd6a82f16c40df30a99d6 SHA512 ad95857b3f9ab9259d13b484804d796551fbee3239fea9196d82f7d596a3f05f6ca628526aefd2fe150c52935b33851116ea9a7533d2ad2590911e55b3f978d2 WHIRLPOOL 1af18964a3cf2db75df7daf317a346933be394e664bb0e53ac4e17b6ed9b8174d20205d9a98ffb1e551daa7013bff161fd3e0cd36d828421c4623e75967c98c2
+MISC ChangeLog 2697 SHA256 af09c5298d04af5e529f3e6c6362476c6a7044f85d3b037f694d5032d9f36ebe SHA512 848b06874b22edf4c77b210a57cd4a8c421b6e2b58fb6765bc0f514a89a174c446b4f7dffd63da0e3ffe0b2d7f66d4704f84a166f7a89ffe313a8e5c30bff4e1 WHIRLPOOL 53e4071712b7f510be30f3b9131ddf513274b0821b2087c44f659608798b4e017415b2cccd1c3946e432b5e95ca5e546f2ecbe21d4060f4d50f696972f9516fd
 MISC metadata.xml 925 SHA256 9b482343b9d05dbf69ac34df5999fe45f8a8529c6ebd4b57bb0678d37505df3f SHA512 239224d707497e129665879c43149011118e4f74f42a14306e3912d0b4436cbb6ff592a0587e1d4045fa972796e1e2462114f53013667dd15f47841f62b68048 WHIRLPOOL c68578baa7660c905d80977c34834413b7d158258a4a993051376a1f8c2212028365f5269842ff33dc0b6a636ba60fd9588b80204bab4e2743bfad1e2596e845
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlGybtoACgkQ1ycZbhPLE2DUfACaAkmqhvqoSUhf97durTNq9c7e
-lHcAn2//Ddzu0UuxzDGXY4OrFTSiy31s
-=JPZM
+iEYEAREIAAYFAlG3YdoACgkQ1ycZbhPLE2Al7ACeOYaXhm50vd0uZMONvg6Ohwbm
+peAAoJVRSDYawGjsoNz1vVdHa/ybs7eW
+=uVtc
 -----END PGP SIGNATURE-----
diff --git a/sci-astronomy/esorex/esorex-3.9.6-r1.ebuild b/sci-astronomy/esorex/esorex-3.9.6-r1.ebuild
deleted file mode 100644
index bd38868d52d0..000000000000
--- a/sci-astronomy/esorex/esorex-3.9.6-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/esorex/esorex-3.9.6-r1.ebuild,v 1.2 2012/08/05 17:28:46 bicatali Exp $
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils
-
-DESCRIPTION="ESO Recipe Execution Tool to exec cpl scripts"
-HOMEPAGE="http://www.eso.org/sci/software/cpl/esorex.html"
-SRC_URI="ftp://ftp.eso.org/pub/dfs/pipelines/libraries/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-DEPEND=">=sci-astronomy/cpl-6"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-autoconf-26.patch
-	"${FILESDIR}"/${P}-use-system-ltdl.patch
-	"${FILESDIR}"/${P}-use-shared-libs.patch
-	"${FILESDIR}"/${P}-set-default-plugin-path.patch
-	"${FILESDIR}"/${P}-move-rcfile-to-etc.patch
-)
-
-export CPLDIR="${EPREFIX}/usr"
-
-src_install() {
-	autotools-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-astronomy/esorex/files/esorex-3.9.6-autoconf-26.patch b/sci-astronomy/esorex/files/esorex-3.9.6-autoconf-26.patch
deleted file mode 100644
index 9ac555b2e15e..000000000000
--- a/sci-astronomy/esorex/files/esorex-3.9.6-autoconf-26.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- esorex-3.9.6.orig/configure.ac	2012-08-05 08:13:03.074224198 -0700
-+++ esorex-3.9.6/configure.ac	2012-08-05 08:53:48.620411326 -0700
-@@ -20,7 +20,7 @@
- AC_PROG_CC
- AC_PROG_CPP
- AM_PROG_CC_C_O
--AM_C_PROTOTYPES
-+#AM_C_PROTOTYPES
- #
- # Check for purify
- #
diff --git a/sci-astronomy/esorex/files/esorex-3.9.6-move-rcfile-to-etc.patch b/sci-astronomy/esorex/files/esorex-3.9.6-move-rcfile-to-etc.patch
deleted file mode 100644
index e69af62e27b3..000000000000
--- a/sci-astronomy/esorex/files/esorex-3.9.6-move-rcfile-to-etc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Ole Streicher <debian@liska.ath.cx>
-Description: The configuration directory is /etc, independent of
- the prefix. This was set wrong in er_prefix.h and is corrected
- here.
---- a/src/er_prefix.h.in
-+++ b/src/er_prefix.h.in
-@@ -3,5 +3,5 @@
- MYDATA = @datadir@
- ESOREX_PREFIX=@prefix@
- */
--#define ESOREX_PREFIX "@prefix@/etc/"
-+#define ESOREX_PREFIX "@sysconfdir@"
- 
diff --git a/sci-astronomy/esorex/files/esorex-3.9.6-set-default-plugin-path.patch b/sci-astronomy/esorex/files/esorex-3.9.6-set-default-plugin-path.patch
deleted file mode 100644
index 2dc6c86bfc3d..000000000000
--- a/sci-astronomy/esorex/files/esorex-3.9.6-set-default-plugin-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Ole Streicher <debian@liska.ath.cx>
-Description: Set the default plugin path to the one where recipes are
- installed in Debian.
---- a/etc/esorex.rc.in
-+++ b/etc/esorex.rc.in
-@@ -130,7 +130,7 @@
- # as well. Multiple directory heads may be specified, by separating the
- # starting paths with colons (:). This option may also be set using the
- # environment variable ESOREX_PLUGIN_DIR.
--esorex.caller.recipe-dir=@prefix@/lib/esopipes-plugins
-+esorex.caller.recipe-dir=@exec_prefix@/lib/@build_alias@/cpl/plugins:@exec_prefix@/lib/cpl/plugins
- 
- # --suppress-link
- # When TRUE, no symbolic link is created to the output product. However, if
diff --git a/sci-astronomy/esorex/files/esorex-3.9.6-use-system-ltdl.patch b/sci-astronomy/esorex/files/esorex-3.9.6-use-system-ltdl.patch
deleted file mode 100644
index 819cdfef2b25..000000000000
--- a/sci-astronomy/esorex/files/esorex-3.9.6-use-system-ltdl.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -Nur esorex-3.9.6.orig/configure.ac esorex-3.9.6/configure.ac
---- esorex-3.9.6.orig/configure.ac	2012-08-05 08:13:03.074224198 -0700
-+++ esorex-3.9.6/configure.ac	2012-08-05 08:57:19.609538901 -0700
-@@ -32,14 +32,14 @@
- 
- ESO_CHECK_DOCTOOLS
- 
--AC_LIBLTDL_CONVENIENCE
-+LT_INIT([dlopen,shared])
-+AC_CHECK_HEADER([ltdl.h],
-+    [AC_CHECK_LIB([ltdl], [lt_dladvise_init],
-+        [LIBLTDL=-lltdl], [LIBLTDL=])],
-+    [LIBLTDL=])
-+
- AC_SUBST(INCLTDL)
- AC_SUBST(LIBLTDL)
--
--AC_ENABLE_STATIC(no)
--AC_ENABLE_SHARED(yes)
--
--AC_PROG_LIBTOOL
- AC_SUBST(LIBTOOL_DEPS)
- 
- # Checks for libraries.
-@@ -78,7 +78,6 @@
- AC_LTDL_SHLIBEXT
- 
- 
--AC_CONFIG_SUBDIRS(libltdl)
- 
- AC_CONFIG_FILES(Makefile
-                 Makefile.purify
-diff -Nur esorex-3.9.6.orig/Makefile.am esorex-3.9.6/Makefile.am
---- esorex-3.9.6.orig/Makefile.am	2012-08-05 08:13:03.077224137 -0700
-+++ esorex-3.9.6/Makefile.am	2012-08-05 08:58:00.417757040 -0700
-@@ -25,7 +25,6 @@
- DISTCLEANFILES = *~
- 
- 
--COMPILE_FIRST = libltdl
- 
- TOPSUBDIRS = src etc
-