Version bump

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

4 files changed, 14 insertions, 50 deletions

diff --git a/sci-astronomy/esorex/ChangeLog b/sci-astronomy/esorex/ChangeLog
index 87dc20a08dcf..6fd47ab5a714 100644
--- a/sci-astronomy/esorex/ChangeLog
+++ b/sci-astronomy/esorex/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-astronomy/esorex
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/esorex/ChangeLog,v 1.12 2014/04/04 15:50:20 bicatali Exp $
+
+*esorex-3.10.2 (04 Apr 2014)
+
+  04 Apr 2014; Sebastien Fabbro <fabbros@gentoo.org> +esorex-3.10.2.ebuild,
+  -esorex-3.10-r1.ebuild, -esorex-3.10.ebuild:
+  Version bump
 
 *esorex-3.10-r2 (04 Mar 2014)
 
diff --git a/sci-astronomy/esorex/Manifest b/sci-astronomy/esorex/Manifest
index b1806d3a7ff3..18f8f70f828d 100644
--- a/sci-astronomy/esorex/Manifest
+++ b/sci-astronomy/esorex/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 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
@@ -9,16 +6,9 @@ AUX esorex-3.10-remove-empty-configdir.patch 400 SHA256 03a89a4072b52c85866f5cb6
 AUX esorex-3.10-remove-private-ltdl.patch 1053 SHA256 d7dd4f889409e28c510b0f11d6d6d1efd75fd5e7fcad96b22700c6be60bd6b4e SHA512 039e6147d6ccb08cbde344ca21628e03bc039bd16ea9edc2cc5d5cea60f5478166f5f82b60b63fcfc71a6bf003510071d11b4882ef0c3cd3ba01c4a7d914d520 WHIRLPOOL 5d3ac2162d067af71e6c9231bd4a07b2eafaf8d96cb7be347b666ed1e12b760844cde4ca3fdbd0272c5fc33248e6a52ec18cc156411710d0d949565b38beb4fd
 AUX esorex-3.10-set-default-plugin-path.patch 951 SHA256 d39d57620e1c38d5167f0003c9ea4b5ce8c870f82a764b2e7d90ed5a69989a2a SHA512 004ebad285f4bc8eac0917ccdd1ab22563f73926b276e5ce2c469e144a6f7d6f2310c098904aeab73e88d57886147dcfae7704ec54a3b5ef86005a58f6f41829 WHIRLPOOL 3255a3a63d315895c0afa07011cc6c4f1d0191a4c39afc8b1c244cf1f868104cd4af9a5f49bb1cd3bba513ebb66f99b34721398bbcce8d0759bec8e53a0030c4
 AUX esorex-3.9.6-use-shared-libs.patch 562 SHA256 1a8922317e93d5840144b79d84e93b7ca329da9aa0e1872ad3493913e6975e90 SHA512 224ddaa94e1d7f105634f53b4238176ff84b2df0ebbfbfe8470fcb30182b4b3aa874ce002d98275488cf38128586e7dc7da0e26729db748e843ce661fa20930c WHIRLPOOL da69698daaf93607e8a4542dc35c2aaeb6b1327139927276bebca72e4788110c53e3b1aa88e7495b23ec4a1ba75fca1ce2efa34f82a4469a1366d7a393b96884
+DIST esorex-3.10.2.tar.gz 817875 SHA256 9a295754452b3e84fe2bc3674aaaf2e93354d2ad16781cb3f4c3f37ca0214e1e SHA512 6f6f663bd74d61f3612a13fb39e17c984f8ed88d9dd175951b385d9797433b19a6e276841b23b61881cec8702eb8d74061549a922acf939a9a5e98c8016d1ecb WHIRLPOOL cb900ecad2067498c9865cfbd3db4d80f0f2907ea18e8eb3ab5d07aaea2a184520a480ad62cf591a30abbe51023f8f8384139ca67fdd05d3a35cde837f730967
 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 3438 SHA256 918c92ec7ac7d0818785eaba19fcb02dc02852d43ada12bfabd3c6664604042f SHA512 66a8230292902f1bd06351f56cc8302a9dfa1b911a6ae683146812c2c2119c6c339c5e37b5d8c677ca1780145c565d9c126ef373ddcfa1caac6405608a80eabb WHIRLPOOL 7a53c924bab8d28227ab3520e42763a6e48f427da571e3b080dbcd3168cf60bf7bfcae6f92f8c98b4a938fed2c9c2b49500ee93c96f55c6b83118778d0990755
+EBUILD esorex-3.10.2.ebuild 1078 SHA256 6c26808485672bfdb8d6cd818203eec8076a0642f3c0e465eb91d9dcc9cccb3c SHA512 a3d3ee7dbce23961ee4d00971df986c3a982dc22605344a670488f6db24117b4ad3961d8f77c4ea2cbe997869bc8c0239e363ae2f69ef97975ffecad2bc910ba WHIRLPOOL e4701ddde1d3df0ded67ff4f0803a6170acdc72ac3e0c93436401a8e676d0f6e22f46d6c7d8c8050f852288bebbefe17eedfe572f5d71387690cf8fea34faacc
+MISC ChangeLog 3607 SHA256 bf7bc9265ff4521f5b544e64f2ca2cea114c7f927f2cbbcd90d9fb79f3277267 SHA512 c855e5f4656da51f2415634af6226fd459bc41093667d1532f6746cebeb1a99ebf9c481f398f08aaaa3d7683e4bb64c97c13318e15dcbcbf5f7ecbaae6092b92 WHIRLPOOL 09a5f08714a15a633ed7bda351c6309c94c89d3c742282c01d3c2f85def1701f22a78dfed9eacd4ed789220678f7e28aab519f6c5d0b3c40e2ed92f34476382d
 MISC metadata.xml 925 SHA256 9b482343b9d05dbf69ac34df5999fe45f8a8529c6ebd4b57bb0678d37505df3f SHA512 239224d707497e129665879c43149011118e4f74f42a14306e3912d0b4436cbb6ff592a0587e1d4045fa972796e1e2462114f53013667dd15f47841f62b68048 WHIRLPOOL c68578baa7660c905d80977c34834413b7d158258a4a993051376a1f8c2212028365f5269842ff33dc0b6a636ba60fd9588b80204bab4e2743bfad1e2596e845
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iEYEAREIAAYFAlMVHRsACgkQ1ycZbhPLE2A4iACcDykNRX1dZDJFz02jnSZb7Cf7
-yXYAn15DepvxN02Yx97DD9j3I/wqubbN
-=eaC6
------END PGP SIGNATURE-----
diff --git a/sci-astronomy/esorex/esorex-3.10-r1.ebuild b/sci-astronomy/esorex/esorex-3.10.2.ebuild
index b1404021624e..5d8c9487467c 100644
--- a/sci-astronomy/esorex/esorex-3.10-r1.ebuild
+++ b/sci-astronomy/esorex/esorex-3.10.2.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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-r1.ebuild,v 1.1 2013/07/25 17:26:47 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/esorex/esorex-3.10.2.ebuild,v 1.1 2014/04/04 15:50:20 bicatali Exp $
 
 EAPI=5
 
 AUTOTOOLS_AUTORECONF=1
 AUTOTOOLS_IN_SOURCE_BUILD=1
+AT_NO_RECURSIVE=1
 
 inherit autotools-utils
 
@@ -18,13 +19,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-DEPEND=">=sci-astronomy/cpl-6.3"
+DEPEND=">=sci-astronomy/cpl-6.3:0="
 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
diff --git a/sci-astronomy/esorex/esorex-3.10.ebuild b/sci-astronomy/esorex/esorex-3.10.ebuild
deleted file mode 100644
index 5c5cfbba7452..000000000000
--- a/sci-astronomy/esorex/esorex-3.10.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/esorex/esorex-3.10.ebuild,v 1.1 2013/06/07 23:38:01 bicatali Exp $
-
-EAPI=5
-
-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.3"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.9.6-use-shared-libs.patch )
-
-export CPLDIR="${EPREFIX}/usr"
-
-src_install() {
-	autotools-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}