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

(Portage version: 2.2.01.20796-prefix/cvs/Linux x86_64)

7 files changed, 103 insertions, 28 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/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
+