Version bump. Remove obsolete versions. Fix building with automake-1.13 (bug #466956, thanks to Alphat-PC).

(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

9 files changed, 55 insertions, 205 deletions

diff --git a/dev-lang/orc/ChangeLog b/dev-lang/orc/ChangeLog
index f82673778888..c21047014b97 100644
--- a/dev-lang/orc/ChangeLog
+++ b/dev-lang/orc/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-lang/orc
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/orc/ChangeLog,v 1.30 2012/12/04 15:37:34 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/orc/ChangeLog,v 1.31 2013/04/29 13:49:11 tetromino Exp $
+
+*orc-0.4.17 (29 Apr 2013)
+
+  29 Apr 2013; Alexandre Rostovtsev <tetromino@gentoo.org> -orc-0.4.9.ebuild,
+  -orc-0.4.10.ebuild, -orc-0.4.11.ebuild, -orc-0.4.14.ebuild,
+  -orc-0.4.16.ebuild, orc-0.4.16-r1.ebuild, +orc-0.4.17.ebuild,
+  -files/orc-0.4.9-make-valgrind-optional.patch,
+  +files/orc-0.4.17-AM_CONFIG_HEADER.patch:
+  Version bump. Remove obsolete versions. Fix building with automake-1.13 (bug
+  #466956, thanks to Alphat-PC).
 
   04 Dec 2012; <ago@gentoo.org> orc-0.4.16-r1.ebuild:
   Stable for x86, wrt bug #442438
diff --git a/dev-lang/orc/files/orc-0.4.17-AM_CONFIG_HEADER.patch b/dev-lang/orc/files/orc-0.4.17-AM_CONFIG_HEADER.patch
new file mode 100644
index 000000000000..6ee70d9209e6
--- /dev/null
+++ b/dev-lang/orc/files/orc-0.4.17-AM_CONFIG_HEADER.patch
@@ -0,0 +1,28 @@
+From 8905d3d5bf8005944268c3500eec20b61923de89 Mon Sep 17 00:00:00 2001
+From: Josep Torra <n770galaxy@gmail.com>
+Date: Sat, 30 Mar 2013 12:52:33 +0100
+Subject: [PATCH] configure: replace deprecated AM_CONFIG_HEADER with
+ AC_CONFIG_HEADERS
+
+AM_CONFIG_HEADER has been removed in the just-released automake 1.13:
+https://lists.gnu.org/archive/html/automake/2012-12/msg00038.html
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 89812ba..4ebebd1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -10,7 +10,7 @@ AM_INIT_AUTOMAKE(1.6)
+ ORC_MAJORMINOR=0.4
+ AC_SUBST(ORC_MAJORMINOR)
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADER(config.h)
+ 
+ dnl CURRENT, REVISION, AGE
+ dnl - library source changed -> increment REVISION
+-- 
+1.8.2.1
+
diff --git a/dev-lang/orc/files/orc-0.4.9-make-valgrind-optional.patch b/dev-lang/orc/files/orc-0.4.9-make-valgrind-optional.patch
deleted file mode 100644
index 9614f19ef27b..000000000000
--- a/dev-lang/orc/files/orc-0.4.9-make-valgrind-optional.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 81d0728db9d7442407c0d308ff1501d5778a14ed Mon Sep 17 00:00:00 2001
-From: Arun Raghavan <ford_prefect@gentoo.org>
-Date: Wed, 8 Sep 2010 22:59:53 +0530
-Subject: [PATCH] configure: Make valgrind header check optional
-
----
- configure.ac |   11 ++++++++++-
- 1 files changed, 10 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 417b56b..ecfd2d4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -84,7 +84,16 @@ if test "$orc_cv_monotonic_clock" = "yes"; then
-   AC_DEFINE(HAVE_MONOTONIC_CLOCK,1,[Defined if we have a monotonic clock])
- fi
- 
--AC_CHECK_HEADERS([valgrind/valgrind.h])
-+AC_ARG_ENABLE([valgrind],
-+  AC_HELP_STRING([--enable-valgrind],[enable valgrind support (default: auto)]),
-+  [], [enable_valgrind=auto])
-+if test "x${enable_valgrind}" != "xno"; then
-+  AC_CHECK_HEADERS([valgrind/valgrind.h],
-+		   [found_valgrind_h=yes], [found_valgrind_h=no])
-+  if test "x${enable_valgrind}" = "xyes" -a "x${found_valgrind_h}" = "no"; then
-+    AC_MSG_ERROR([Valgrind support requested, but valgrind/valgrind.h not found. Have you installed the valgrind development package?])
-+  fi
-+fi
- 
- AS_COMPILER_FLAG(-Wall, ORC_CFLAGS="$ORC_CFLAGS -Wall")
- if test "x$ORC_CVS" = "xyes"
--- 
-1.7.2.2
-
diff --git a/dev-lang/orc/orc-0.4.10.ebuild b/dev-lang/orc/orc-0.4.10.ebuild
deleted file mode 100644
index c9d99dd29a0a..000000000000
--- a/dev-lang/orc/orc-0.4.10.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/orc/orc-0.4.10.ebuild,v 1.2 2012/11/09 17:38:42 tetromino Exp $
-
-EAPI=3
-inherit autotools
-
-DESCRIPTION="The Oil Runtime Compiler, a just-in-time compiler for array operations"
-HOMEPAGE="http://code.entropywave.com/projects/orc/"
-SRC_URI="http://code.entropywave.com/download/orc/${P}.tar.gz"
-
-LICENSE="BSD BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs examples"
-
-src_prepare() {
-	if ! use examples; then
-		sed -i -e '/SUBDIRS/s:examples::' Makefile.am || die
-		AT_M4DIR="m4" eautoreconf
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--disable-dependency-tracking \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README TODO
-
-	find "${ED}" -name '*.la' -delete
-}
diff --git a/dev-lang/orc/orc-0.4.11.ebuild b/dev-lang/orc/orc-0.4.11.ebuild
deleted file mode 100644
index 8d1dce6b103c..000000000000
--- a/dev-lang/orc/orc-0.4.11.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/orc/orc-0.4.11.ebuild,v 1.7 2012/11/09 17:38:42 tetromino Exp $
-
-EAPI=3
-inherit autotools flag-o-matic
-
-DESCRIPTION="The Oil Runtime Compiler, a just-in-time compiler for array operations"
-HOMEPAGE="http://code.entropywave.com/projects/orc/"
-SRC_URI="http://code.entropywave.com/download/orc/${P}.tar.gz"
-
-LICENSE="BSD BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs examples"
-
-src_prepare() {
-	if ! use examples; then
-		sed -i -e '/SUBDIRS/s:examples::' Makefile.am || die
-		AT_M4DIR="m4" eautoreconf
-	fi
-}
-
-src_configure() {
-	# any optimisation on PPC/Darwin yields in a complaint from the assembler
-	# Parameter error: r0 not allowed for parameter %lu (code as 0 not r0)
-	# the same for Intel/Darwin, although the error message there is different
-	# but along the same lines
-	[[ ${CHOST} == *-darwin* ]] && filter-flags -O*
-	econf \
-		$(use_enable static-libs static) \
-		--disable-dependency-tracking \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README TODO
-
-	find "${ED}" -name '*.la' -delete
-}
diff --git a/dev-lang/orc/orc-0.4.14.ebuild b/dev-lang/orc/orc-0.4.14.ebuild
deleted file mode 100644
index 35803323fc7d..000000000000
--- a/dev-lang/orc/orc-0.4.14.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/orc/orc-0.4.14.ebuild,v 1.6 2012/11/09 17:38:42 tetromino Exp $
-
-EAPI=3
-inherit autotools flag-o-matic
-
-DESCRIPTION="The Oil Runtime Compiler, a just-in-time compiler for array operations"
-HOMEPAGE="http://code.entropywave.com/projects/orc/"
-SRC_URI="http://code.entropywave.com/download/orc/${P}.tar.gz"
-
-LICENSE="BSD BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm hppa ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs examples"
-
-src_prepare() {
-	if ! use examples; then
-		sed -i -e '/SUBDIRS/s:examples::' Makefile.am || die
-		AT_M4DIR="m4" eautoreconf
-	fi
-}
-
-src_configure() {
-	# any optimisation on PPC/Darwin yields in a complaint from the assembler
-	# Parameter error: r0 not allowed for parameter %lu (code as 0 not r0)
-	# the same for Intel/Darwin, although the error message there is different
-	# but along the same lines
-	[[ ${CHOST} == *-darwin* ]] && filter-flags -O*
-	econf \
-		$(use_enable static-libs static) \
-		--disable-dependency-tracking \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README TODO
-
-	find "${ED}" -name '*.la' -delete
-}
diff --git a/dev-lang/orc/orc-0.4.16-r1.ebuild b/dev-lang/orc/orc-0.4.16-r1.ebuild
index c24603a82216..e1bafd0696ac 100644
--- a/dev-lang/orc/orc-0.4.16-r1.ebuild
+++ b/dev-lang/orc/orc-0.4.16-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/orc/orc-0.4.16-r1.ebuild,v 1.5 2012/12/04 15:37:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/orc/orc-0.4.16-r1.ebuild,v 1.6 2013/04/29 13:49:11 tetromino Exp $
 
 EAPI=4
-inherit autotools flag-o-matic
+inherit autotools eutils flag-o-matic
 
 DESCRIPTION="The Oil Runtime Compiler, a just-in-time compiler for array operations"
 HOMEPAGE="http://code.entropywave.com/projects/orc/"
@@ -21,6 +21,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	if ! use examples; then
 		sed -i -e '/SUBDIRS/s:examples::' Makefile.am || die
+		epatch "${FILESDIR}/${PN}-0.4.17-AM_CONFIG_HEADER.patch" # in 0.4.18
 		AT_M4DIR="m4" eautoreconf
 	fi
 }
diff --git a/dev-lang/orc/orc-0.4.16.ebuild b/dev-lang/orc/orc-0.4.17.ebuild
index 3dba94e52662..1f595611806d 100644
--- a/dev-lang/orc/orc-0.4.16.ebuild
+++ b/dev-lang/orc/orc-0.4.17.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/orc/orc-0.4.16.ebuild,v 1.3 2012/11/09 17:38:42 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/orc/orc-0.4.17.ebuild,v 1.1 2013/04/29 13:49:11 tetromino Exp $
 
-EAPI=4
-inherit autotools flag-o-matic
+EAPI="5"
+inherit autotools eutils flag-o-matic
 
 DESCRIPTION="The Oil Runtime Compiler, a just-in-time compiler for array operations"
 HOMEPAGE="http://code.entropywave.com/projects/orc/"
@@ -14,9 +14,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs examples"
 
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am"
+
 src_prepare() {
 	if ! use examples; then
 		sed -i -e '/SUBDIRS/s:examples::' Makefile.am || die
+		epatch "${FILESDIR}/${P}-AM_CONFIG_HEADER.patch" # in 0.4.18
 		AT_M4DIR="m4" eautoreconf
 	fi
 }
@@ -28,12 +33,10 @@ src_configure() {
 	# but along the same lines
 	[[ ${CHOST} == *-darwin* ]] && filter-flags -O*
 	econf \
-		$(use_enable static-libs static) \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+		$(use_enable static-libs static)
 }
 
 src_install() {
 	default
-
-	find "${ED}" -name '*.la' -delete
+	prune_libtool_files
 }
diff --git a/dev-lang/orc/orc-0.4.9.ebuild b/dev-lang/orc/orc-0.4.9.ebuild
deleted file mode 100644
index 719b91a11485..000000000000
--- a/dev-lang/orc/orc-0.4.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/orc/orc-0.4.9.ebuild,v 1.3 2012/11/09 17:38:42 tetromino Exp $
-
-EAPI=3
-
-inherit autotools eutils
-
-DESCRIPTION="The Oil Runtime Compiler, a just-in-time compiler for array operations"
-HOMEPAGE="http://code.entropywave.com/projects/orc/"
-SRC_URI="http://code.entropywave.com/download/orc/${P}.tar.gz"
-
-LICENSE="BSD BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs examples"
-
-src_prepare() {
-	if ! use examples; then
-		sed -i -e '/SUBDIRS/s:examples::' Makefile.am || die
-	fi
-
-	epatch "${FILESDIR}/${P}-make-valgrind-optional.patch"
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--disable-dependency-tracking \
-		--disable-valgrind \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README TODO
-
-	find "${ED}" -name '*.la' -delete
-}