Fixed autoreconf bug #503222, add cpl6 compatibility patch

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

5 files changed, 72 insertions, 10 deletions

diff --git a/sci-astronomy/esorex/ChangeLog b/sci-astronomy/esorex/ChangeLog
index c8fa37d4af19..87dc20a08dcf 100644
--- a/sci-astronomy/esorex/ChangeLog
+++ b/sci-astronomy/esorex/ChangeLog
@@ -1,6 +1,12 @@
 # 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.10 2013/07/25 17:26:47 bicatali Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/esorex/ChangeLog,v 1.11 2014/03/04 00:23:49 bicatali Exp $
+
+*esorex-3.10-r2 (04 Mar 2014)
+
+  04 Mar 2014; Sébastien Fabbro <bicatali@gentoo.org> +esorex-3.10-r2.ebuild,
+  +files/esorex-3.10-cpl60_compat.patch, files/esorex-3.10-fix-autotools.patch:
+  Fixed autoreconf bug #503222, add cpl6 compatibility patch
 
 *esorex-3.10-r1 (25 Jul 2013)
 
diff --git a/sci-astronomy/esorex/Manifest b/sci-astronomy/esorex/Manifest
index 9d0a68f26a0b..b1806d3a7ff3 100644
--- a/sci-astronomy/esorex/Manifest
+++ b/sci-astronomy/esorex/Manifest
@@ -1,7 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX esorex-3.10-fix-autotools.patch 299 SHA256 228c524e9dea6296299b41dda11515f5a22373623abb7b7adab3ebf5c738a9f7 SHA512 6044c916ece118c455a69a14e8a4d26bb66a75eb30291dea877f6cac93d919e3b39e9887d695ec153ef50abb1b546f937ae5d0c4d94191e97a1247c18990eda5 WHIRLPOOL 00ca2603e61cc0e4a41253ba1540dd46281ffc3e1317853830f417b9c829aca73fc993df24dee84bfee9dedf4d906345e457c98c8cdb4797f98d0efb643414c1
+AUX esorex-3.10-cpl60_compat.patch 383 SHA256 ecdb37f7ca04a5df20eecfe71004e7f16b4beedc7b8620a4533bf134347a9e33 SHA512 679c9c26bead69438560beca417efed0ee92d283898f98552cb6fd8b0e5388993abc266c7bc63bc49c0a8bcebc3af5dd9c1a5fdb4d2f54e49b9f0f7dec83fb1a WHIRLPOOL 72f6ea337b3ceadc5352aa3d5e490544994f92d5e43efcc63ea2f87ac5a7051b00a951eff518ead56b5ff7f45dd35c3cdacbed9ab574b7ad682eec054c60f1a5
+AUX esorex-3.10-fix-autotools.patch 324 SHA256 85663c76d018d31460be171e571696924d403d6b16bb9877ce90b2924bcbcd33 SHA512 b526d0ca691eebc1383c5d0c10859fd3d1c004269d7dbd6451375b823d92b92964a7252f426914c5865b20cf897c9a6b2f68ea8841c0c09325e260db7a26b5cf WHIRLPOOL 5428e895e7bce7c6bbf0e8d5ecd0a3b4deb0b442214e7341ee300d3dab036fde2039b1514e8fb62b760751b8e8426e3bdde59897b1ec74b16f8413c76a1bf9db
 AUX esorex-3.10-fix_format_strings.patch 845 SHA256 caf734b4501639f88470043425260b309ca655a32b939cd6ac3935993f8284b0 SHA512 9bcb4cb1ab0eb6ed846df7ec22abd6004d2fd72a8255cfa482f9ecd039255e4d1ccf987fad60265347e17cefcb0dde226f923048fcad15e384a7bd6884aa8541 WHIRLPOOL 6f9c6a0b7116de526fdff9fb626e9fa95670b77af5695e64ef18b7b1e6cd871d8f60b36bc0e98291f24627a36b4a693f6ccdfdadafe268eb306612cf8588572e
 AUX esorex-3.10-generate-manpage.patch 4865 SHA256 ca69cc20e5291dce3fe2bec20ee7ef4929f98c7a635208ff0e2d1a8645eb755c SHA512 5a2aeb18e08f36969d439f999f76933030b6a462b8e10041f20d3ffccefdf04f68daeecaaab7ee1694a0127bfe570cd0db8fbf9ced17a484eac2023929aff2b8 WHIRLPOOL 2314b9a10406d9c7ff695e9626dceade5670597dd7cfabf3a53f9016ae875c6e5263dd9040ce157a2cca88c2c3da5632175a3bdb97b59d36c27ddb5cc75dc9c9
 AUX esorex-3.10-remove-empty-configdir.patch 400 SHA256 03a89a4072b52c85866f5cb601d7f71a51fbe4cda9e5fba07a8e3c76bae37a3f SHA512 24c2893f47c779368f72a01b00088e1dccb830797a7c3c094b48dda833770b37b9d98f8a7068d1d12e0a88182b0649e0418cb24c5f597cfb2467caee9e1d0f14 WHIRLPOOL bc3d5001dfb179d3b494d90620942656b4d6ecf5aaed3dbdb37001286a4852540e882d45aeb6f4d06a0fbace40482a7855de3640c65a233f3660e7a03fd8ea61
@@ -10,13 +11,14 @@ AUX esorex-3.10-set-default-plugin-path.patch 951 SHA256 d39d57620e1c38d5167f000
 AUX esorex-3.9.6-use-shared-libs.patch 562 SHA256 1a8922317e93d5840144b79d84e93b7ca329da9aa0e1872ad3493913e6975e90 SHA512 224ddaa94e1d7f105634f53b4238176ff84b2df0ebbfbfe8470fcb30182b4b3aa874ce002d98275488cf38128586e7dc7da0e26729db748e843ce661fa20930c WHIRLPOOL da69698daaf93607e8a4542dc35c2aaeb6b1327139927276bebca72e4788110c53e3b1aa88e7495b23ec4a1ba75fca1ce2efa34f82a4469a1366d7a393b96884
 DIST esorex-3.10.tar.gz 817307 SHA256 72ff1d26a45d7e926b1f4f74f1f286c8feb142dba7b0b5bb717c6286644f9494 SHA512 985a906418488fec46fc939bf64b40330ae829771860a36a40240b703f6f6f89f3da6701ee4ceb8c6d2c0b478004596dce4dbc11389937e75ef02d9ecb4c3d16 WHIRLPOOL ef368d35f5145b5626c88d6d4af7249889cce1ef901c67318d1f06f9baa7a0411c87917969261c0a268a06e5fd0dafd30701f49394cb82671f8c9ce282bc4768
 EBUILD esorex-3.10-r1.ebuild 1104 SHA256 4db98a946c0b784273f21263ee96abda8704ea289def79039b0e59e1cdc0af38 SHA512 c17a3d949e05c4a27118636926b04a072a0e86148e0d1812fcbb8b30cf47a3bf40ddcd8b159d0dde4673981beb100e454e87c408d30b06c560383b204f08e1a1 WHIRLPOOL 3654739586b65b9470da423d2700017597e3cd907896d2e41edbaccbb3e57e5ca367139f7882dd560a85fa877d45ac91ac55e5e6bd6bf58b87adc903e6f51881
+EBUILD esorex-3.10-r2.ebuild 1169 SHA256 e84bc3ea94afd312fda1367816dc1fa434f655ff799e7c307528ffbfff75f4c9 SHA512 b32eb748a8238a93968732e26976b23dfc87e5bfbb0ff13e5a2521ffb33c3674aa391d2544a586b014349e14558d691c539e87dd91a6c611893f0ca537e6a85e WHIRLPOOL 9e0f896d05ab7f8d57c7ac74f4b661c507deb59b854ee0a73140b2f108c3848a436863815d21f4f704be2de726e94d0801357bf321b06363846ad344de9136b5
 EBUILD esorex-3.10.ebuild 835 SHA256 de89161eaee83613d59567cd9992fd5c307700bddfb4738177436b23dabd633e SHA512 ed635437b918ab69c605297c82d26e23aa0c1ba2345c6349df623d9707310cffa54a89bec6abcdeb95ad9206deff3341e87073970594676e8d80458575fb27e6 WHIRLPOOL 8b4f09748c5dcf09f07a5dae766409295f09a93da9a58e46c1c079b923e5d0d8b8ec6b97123d4834d1f666653dcf5c97d934df2c73d6ff38dbfb69dc09476935
-MISC ChangeLog 3186 SHA256 f81dd4b5ff298df7c5674078b0bb8682f425d81c9de1fb95f7e0c172c553d9e6 SHA512 f913e443107dd84ecbd585343a60fdb73cae39bc02b35bb0d8b8ea8a44ea33adb8b0f50df6847b886e3b945ca6f7a800a877054135b1b0c0789ab80c6669a205 WHIRLPOOL bfcf4ce6280543a9695c8042a6983da80a8de7ee674d18fec19abc93f6883b8a84c2f25074bc5fa3f1282c6c5544521e56a70178281485488a217aea1e648425
+MISC ChangeLog 3438 SHA256 918c92ec7ac7d0818785eaba19fcb02dc02852d43ada12bfabd3c6664604042f SHA512 66a8230292902f1bd06351f56cc8302a9dfa1b911a6ae683146812c2c2119c6c339c5e37b5d8c677ca1780145c565d9c126ef373ddcfa1caac6405608a80eabb WHIRLPOOL 7a53c924bab8d28227ab3520e42763a6e48f427da571e3b080dbcd3168cf60bf7bfcae6f92f8c98b4a938fed2c9c2b49500ee93c96f55c6b83118778d0990755
 MISC metadata.xml 925 SHA256 9b482343b9d05dbf69ac34df5999fe45f8a8529c6ebd4b57bb0678d37505df3f SHA512 239224d707497e129665879c43149011118e4f74f42a14306e3912d0b4436cbb6ff592a0587e1d4045fa972796e1e2462114f53013667dd15f47841f62b68048 WHIRLPOOL c68578baa7660c905d80977c34834413b7d158258a4a993051376a1f8c2212028365f5269842ff33dc0b6a636ba60fd9588b80204bab4e2743bfad1e2596e845
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlHxX9oACgkQ1ycZbhPLE2Dh/gCggWiwqJoYzl5Ww1TXV10pm27V
-90AAoIvrYRq0l21LIgCOU5qSGdMZsjEN
-=69Fd
+iEYEAREIAAYFAlMVHRsACgkQ1ycZbhPLE2A4iACcDykNRX1dZDJFz02jnSZb7Cf7
+yXYAn15DepvxN02Yx97DD9j3I/wqubbN
+=eaC6
 -----END PGP SIGNATURE-----
diff --git a/sci-astronomy/esorex/esorex-3.10-r2.ebuild b/sci-astronomy/esorex/esorex-3.10-r2.ebuild
new file mode 100644
index 000000000000..e9515aeb54d2
--- /dev/null
+++ b/sci-astronomy/esorex/esorex-3.10-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/esorex/esorex-3.10-r2.ebuild,v 1.1 2014/03/04 00:23:49 bicatali Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+AT_NO_RECURSIVE=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=""
+
+DEPEND=">=sci-astronomy/cpl-6.3:="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.9.6-use-shared-libs.patch
+	"${FILESDIR}"/${PN}-3.10-remove-private-ltdl.patch
+	"${FILESDIR}"/${PN}-3.10-fix-autotools.patch
+	"${FILESDIR}"/${PN}-3.10-generate-manpage.patch
+	"${FILESDIR}"/${PN}-3.10-remove-empty-configdir.patch
+	"${FILESDIR}"/${PN}-3.10-set-default-plugin-path.patch
+	"${FILESDIR}"/${PN}-3.10-cpl60_compat.patch
+)
+
+export CPLDIR="${EPREFIX}/usr"
+
+src_install() {
+	autotools-utils_src_install
+	dodoc -r examples
+	docompress -x /usr/share/doc/${PF}/examples
+}
diff --git a/sci-astronomy/esorex/files/esorex-3.10-cpl60_compat.patch b/sci-astronomy/esorex/files/esorex-3.10-cpl60_compat.patch
new file mode 100644
index 000000000000..1203f7812fa0
--- /dev/null
+++ b/sci-astronomy/esorex/files/esorex-3.10-cpl60_compat.patch
@@ -0,0 +1,13 @@
+Author: Ole Streicher <debian@liska.ath.cx>
+Subject: Remove function that is only in cpl >= 6.3 to establish compability
+ with older (stable) versions and allow backporting.
+--- a/src/er_main.c
++++ b/src/er_main.c
+@@ -641,7 +641,6 @@
+ 
+ cpl_msg_set_domain (PACKAGE);
+ cpl_msg_set_time_off ();
+-cpl_msg_set_threadid_off ();
+ cpl_msg_set_domain_on ();
+ cpl_msg_set_component_off ();
+ 
diff --git a/sci-astronomy/esorex/files/esorex-3.10-fix-autotools.patch b/sci-astronomy/esorex/files/esorex-3.10-fix-autotools.patch
index 44919f54aa9b..68fbcb971f45 100644
--- a/sci-astronomy/esorex/files/esorex-3.10-fix-autotools.patch
+++ b/sci-astronomy/esorex/files/esorex-3.10-fix-autotools.patch
@@ -1,7 +1,7 @@
 Author: Ole Streicher <debian@liska.ath.cx>
 Subject: Fix autotools files to allow the current version.
---- a/configure.ac
-+++ b/configure.ac
+--- esorex-3.10/configure.ac.orig
++++ esorex-2.10/configure.ac
 @@ -5,6 +5,7 @@
  
  AC_CONFIG_SRCDIR([Makefile.am])