Added several patches for newer autoconf, to use system libtdl, and respect file system standard

Package-Manager: portage-2.2.01.20796-prefix/cvs/Linux x86_64

8 files changed, 117 insertions, 40 deletions

diff --git a/sci-astronomy/esorex/ChangeLog b/sci-astronomy/esorex/ChangeLog
index a6ca631e90ae..6f1b01b06897 100644
--- a/sci-astronomy/esorex/ChangeLog
+++ b/sci-astronomy/esorex/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sci-astronomy/esorex
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/esorex/ChangeLog,v 1.5 2012/06/04 22:57:51 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/esorex/ChangeLog,v 1.6 2012/08/05 17:23:27 bicatali Exp $
+
+*esorex-3.9.6-r1 (05 Aug 2012)
+
+  05 Aug 2012; 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, -esorex-3.9.0.ebuild,
+  -esorex-3.9.6.ebuild:
+  Added several patches for newer autoconf, to use system libtdl, and respect
+  file system standard
 
 *esorex-3.9.6 (04 Jun 2012)
 
diff --git a/sci-astronomy/esorex/Manifest b/sci-astronomy/esorex/Manifest
index 80707826c3ec..46988f1be6c9 100644
--- a/sci-astronomy/esorex/Manifest
+++ b/sci-astronomy/esorex/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX esorex-3.9.6-use-shared-libs.patch 562 RMD160 8edd715b8fa239f30633b9f29f99efbb2e66cc99 SHA1 73db7557b8cad3f2257b357a1009731758583a58 SHA256 1a8922317e93d5840144b79d84e93b7ca329da9aa0e1872ad3493913e6975e90
-DIST esorex-3.9.0.tar.gz 748335 RMD160 121c033a6866e48eedb0e48b85c07923f39eed9d SHA1 e3c2fb3de9582651be2e99f7a4b2b1d2a7b415b9 SHA256 23c17ba9b56ac26765dd63555b278901c08f8a52a90e48e52e335e5cd18103d2
-DIST esorex-3.9.6.tar.gz 799988 RMD160 9dd32e7e55417293bfcb6e52ba0923ed338c23dd SHA1 00165c0281986db84cbafd71216e7c6ab70954a5 SHA256 9adba0f8c712ffa5f6b553618e927197e25bb71b4d2ab7b5e64482aea269a0ac
-EBUILD esorex-3.9.0.ebuild 625 RMD160 78c4d93f8ee252af47d2a6d3f8a471da7338ec54 SHA1 ae6db40ccc6668b095355c082e645c7bcae14546 SHA256 1c47b54a575e7a624eef81a4fd43e73ebb2125f01f5218a3beef8555392ba5a4
-EBUILD esorex-3.9.6.ebuild 771 RMD160 02b9ded741a5e730293588ee120776a4447e6424 SHA1 72cd5fbb8ad6cddb941734046acf7947f8114619 SHA256 a170a2c95599f94de94795969edff285fa542f714742eb076dcc30b1bb076b89
-MISC ChangeLog 1735 RMD160 5fa4541a56c6481afd0c7e78945a809a24dc067c SHA1 fb0a47db9800e7d7ed4d193ccf1e558b0c93f47a SHA256 efde0405e95805085ce50e6e3881d652e275444c1dbb8254700412a5c91d4ba3
-MISC metadata.xml 925 RMD160 c334e7431cef5da68f0730b87d4ef60f5778435f SHA1 c18218f4b790f4f2941f0072d43d25ed706c4c7d SHA256 9b482343b9d05dbf69ac34df5999fe45f8a8529c6ebd4b57bb0678d37505df3f
+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.9.6.tar.gz 799988 SHA256 9adba0f8c712ffa5f6b553618e927197e25bb71b4d2ab7b5e64482aea269a0ac SHA512 2b938a94f7a767926fa450a87e8364ca9d75053ab6796382c7eec48d09ea9ce70f6384c29f9605915ad43b35afde6873ad01f5b44f3afcde352466e5fbcb2d69 WHIRLPOOL 7dc56e996d06261743edfc4afda98506a6a2f5045206a2024da2d5a0a1f667a2f98158b6ced65391dadef0fc7ffe8b6b94c370dd97261c789360676253ad4075
+EBUILD esorex-3.9.6-r1.ebuild 982 SHA256 33798e8fa76c81c13318b723e3c05a3234f386cecf5d14a1af0fc4c463f307ff SHA512 57ff7444e8cc7277c31d7e35beda35b3e61d4c89e0d76a8dad34cc065f834becb982a859e7ea3bbfa7c75bd8691ee57028275077bccd77cf6df3c02607a291d4 WHIRLPOOL 0ff9aa1b15a35887512c0231d92c58f6569e300c9cf268fd705b48e89d4e1fe6c9ea955630cfa42eb9cfeb75b83273a7a23bfa15dfb4c1988c5ecd793259087a
+MISC ChangeLog 2182 SHA256 ae002715161476aaf6690fa7276a666bebeabab8c7230a4f85c10b9796c6f2ef SHA512 d0f86b5cfeaf5f1c40e8e89eac8dacb808d02b89d47dd6f73684edb09490b8ce3e42a066eb26e75410a59b95fe3012442ff7e23d593d5225a9e04d1d8e6d9e25 WHIRLPOOL 563942b4ef034efcdc17cab9c6f3fb1efbe0381c3861ec06278ec9f4387e47128da6b7134df754700396c358a5226340b025e02defb481d704c23224595213bd
+MISC metadata.xml 925 SHA256 9b482343b9d05dbf69ac34df5999fe45f8a8529c6ebd4b57bb0678d37505df3f SHA512 239224d707497e129665879c43149011118e4f74f42a14306e3912d0b4436cbb6ff592a0587e1d4045fa972796e1e2462114f53013667dd15f47841f62b68048 WHIRLPOOL c68578baa7660c905d80977c34834413b7d158258a4a993051376a1f8c2212028365f5269842ff33dc0b6a636ba60fd9588b80204bab4e2743bfad1e2596e845
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/NPXkACgkQ1ycZbhPLE2BM8ACfTJ0IDYlVnPnWXly2tV1XY59w
-beQAoJScWgSFBDYHIj7m6H/7nkAlVPkj
-=+fR3
+iEYEAREIAAYFAlAerBYACgkQ1ycZbhPLE2DQ0ACgjWnMaku79+moBITga+nSM6yL
+54IAnR+NS8qkcC5qACjpxu1wB6+vueeN
+=6sz6
 -----END PGP SIGNATURE-----
diff --git a/sci-astronomy/esorex/esorex-3.9.0.ebuild b/sci-astronomy/esorex/esorex-3.9.0.ebuild
deleted file mode 100644
index 32b5b38de7a7..000000000000
--- a/sci-astronomy/esorex/esorex-3.9.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/esorex/esorex-3.9.0.ebuild,v 1.1 2011/04/08 04:48:13 bicatali Exp $
-
-EAPI=4
-
-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/cpl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND=">=sci-astronomy/cpl-5.2"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	default
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-astronomy/esorex/esorex-3.9.6.ebuild b/sci-astronomy/esorex/esorex-3.9.6-r1.ebuild
index 50bec7c66c5a..f76379e94506 100644
--- a/sci-astronomy/esorex/esorex-3.9.6.ebuild
+++ b/sci-astronomy/esorex/esorex-3.9.6-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.1 2012/06/04 22:57:51 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/esorex/esorex-3.9.6-r1.ebuild,v 1.1 2012/08/05 17:23:27 bicatali Exp $
 
 EAPI=4
 
@@ -19,7 +19,15 @@ IUSE="examples"
 DEPEND=">=sci-astronomy/cpl-6"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-use-shared-libs.patch )
+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
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
new file mode 100644
index 000000000000..9ac555b2e15e
--- /dev/null
+++ b/sci-astronomy/esorex/files/esorex-3.9.6-autoconf-26.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..e69af62e27b3
--- /dev/null
+++ b/sci-astronomy/esorex/files/esorex-3.9.6-move-rcfile-to-etc.patch
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 000000000000..2dc6c86bfc3d
--- /dev/null
+++ b/sci-astronomy/esorex/files/esorex-3.9.6-set-default-plugin-path.patch
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 000000000000..819cdfef2b25
--- /dev/null
+++ b/sci-astronomy/esorex/files/esorex-3.9.6-use-system-ltdl.patch
@@ -0,0 +1,43 @@
+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
+