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

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

10 files changed, 74 insertions, 217 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/Manifest b/dev-lang/orc/Manifest
index 48802f046fd2..e5750d43cb29 100644
--- a/dev-lang/orc/Manifest
+++ b/dev-lang/orc/Manifest
@@ -1,14 +1,21 @@
-AUX orc-0.4.9-make-valgrind-optional.patch 1219 SHA256 6a1ed3052955fb552782d8fb31f24fa625d23c88d8ef574d2b58ebfe63f8a867 SHA512 10632a5f8edf77474be2e700d23e482ad2656494e2f0517753c94bd02c36b582c12e47de84eda7be5ded1c417fec985768f7e0ee825f74ccda00aaec2d8d9b1e WHIRLPOOL b5165ed6d24a24c5d2f3ab4056cd6ada88290918624bdbd63a51e3cf74817f8cded36a58c8b74c620e4a4b515747d9caa5c3a2960f1419297bf8f401ced2b154
-DIST orc-0.4.10.tar.gz 664830 SHA256 5001a0034edc06800b546246fbe0407ba6e9759c9583d5d93adba3557b6a777e SHA512 bf33152d07e3f05a5b7f9d4de607054c8872e44f06f1ead2963044b24b0adfd69ca91f4c46b6af9d540fa846b1b40f01ffaf774243566915ec500329c46c173b WHIRLPOOL 24d1b1c3f1f85e491ade791252a4dbc8da266959b0b381b382651ba0ef2b5ea805295f0932407ef39b83407a1181aa6dfce1c88cfe063eda0d68f02018c085e8
-DIST orc-0.4.11.tar.gz 676224 SHA256 6ec60521a11339eda36f1e2210d08ae95010d769575e471aaf365b89bca8d031 SHA512 8e54e682b9e509deff709aef2bee3de3a632949284b62c0c74407ed5fdc651f61b07ff476fd4a9ebdc5fb597349af5546ba9a9ace4b33aee36eee902319d56bb WHIRLPOOL 21e98a53a62f2e3a2c77189a2728ba370f3cd7b954dae8c520856b57a34ae2106ddfd329f0f2153bb997f32d720176aa4a6b806aac93896cf12d99c48be4805c
-DIST orc-0.4.14.tar.gz 660407 SHA256 6b0c536984871954364976516ea0328e2dcd856111726a23e609504ba2b12313 SHA512 961d71caeff340ac3d98aedad398f7f87eaf7d41a7c136a14a15a7ef3713bbd109ce35642e4f8275ceb9bff2796288bf85b5bd183a4dac600f0ba8f8e8ef9fb6 WHIRLPOOL ace652a92f476e5c2fcb4847d69022ebcaa688a6d6923e7cd332474e4f60e6a10b4b33fe5ac8c2ddca7fb073208e7052046a8d793ea31ee78f87913ddd8192a9
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX orc-0.4.17-AM_CONFIG_HEADER.patch 796 SHA256 d3cd2b3cc9fe8f9a85e9f6ac5eceddc1d0080df670ac3f9a90d0aacd014911b4 SHA512 dc0258d02c5a206994abf834a730d0d7215c48efad209d7e7a61deb13893ba797f72ce49d84cad0ca8fcee3613506196b488ce0920f01474efd1a56451cef5a8 WHIRLPOOL b77e37073fc0b79d4acb2f2c6d78b844650a781026ff452f38d34cbd2cffaa8bfb1f32dac653043a1b519de084d3ee16b8fdd4a10b6671e94c78237ebcab8b49
 DIST orc-0.4.16.tar.gz 668368 SHA256 700e4edba20a0ed42164b645da26ce515b883d4c4633b222302f1e541f2a58ab SHA512 e9d3c4e8682119253c201addcd2cb623a61e45d7cb8b0b406a3509f1a9443af9375a418a68f832d29af4a523cd91bf702bdd002cf143be0f7cc9f5a0b77f7ae0 WHIRLPOOL 43e3fafb9869f2f1c678cdb457b958a2ef6955344f71a3377e319c8d42f5ca269e9d4c57a85a792959a6e50d60023bf6717bd8461270b1526aa55cb9657d5012
-DIST orc-0.4.9.tar.gz 654699 SHA256 aac7af5d37ce87b1d3d014822f2e2b6be83daff4d752f56a45766e5a807e6b53 SHA512 1bfde04fa83ae441c3f0051f4d9d6397e231a17428a26c1694111f7531d8692a64ee032cbc003273996e059c315185f871842c1c5eed5962aec05f1c9601bc46 WHIRLPOOL f9c02f88b6b695382b44f80e26c1c455fe911b80913c00f050efdd54d605309056b91e6b53049983d2440b2a3dc2a84b3e30dd5ff4b4df6b0c1b21eeef8c6ae6
-EBUILD orc-0.4.10.ebuild 1027 SHA256 57d5ea46050257ac9f6b9592147a486c4a741844bffd4fa063cb2baa17534e3f SHA512 758df36ec7a2d0f05ff2f8360308ecb724e3d04f73b49b191d3696262e37fe92592c5f44d96baa5d91028a2c7fd78cf4314eb6143ee025311c710ae3b30bb9fe WHIRLPOOL 71858d7728125387b6a481e584616443a793b86b1a9a07b01d8bc03e90af3aee159caa56c35049ccef69a7a895186a2f90d172211b53899fcbbf6eb1bb451d3c
-EBUILD orc-0.4.11.ebuild 1343 SHA256 63a1543b92b1e57c30f2e5e9233f0290f0760895aa1f28f75ca35a0951f22ebb SHA512 60bbbd24b5d576eda670e09f463830661142f665c01251feea25ef2ac37cd12591494b651298150a9b058dbe9a2d2831b065534d11672e69b09a1f709103a867 WHIRLPOOL 89b5894c7becf98e79a73e1ed55fc7701f90a638726b8558f2bdd7984be008088eac68895195b33be4e743df1226d7a6d94c3f70825dfe258ce5fc07037880fc
-EBUILD orc-0.4.14.ebuild 1371 SHA256 152e0adea4c933fe4868da3d5e08fd21dfc0330c5296a135d8380d39aa03bd3d SHA512 537fa1a27ef1de1ccb517e157fb55b15b7308aa2779b579ec5ea888146225f89d79fbb348dc3b9b29d6c0d9e42f519838c7f379576f11389aed42844e4c087a8 WHIRLPOOL 12fe0038782db97c6c75db3682bbc95e0f9023894024c229fa769390921573007b0407fd1f359c3cf34c7713710ced892335138f78602f5d74169b0436744423
-EBUILD orc-0.4.16-r1.ebuild 1291 SHA256 91e711a51dbb5453d469b7d662ca7b3708ad33db4b4467b43775f314774b96c3 SHA512 bb798f1ee43b8a6fa0d5dbb094a36ccdb0c7f53a2fa4d684e70d61ed4329efb2f12dba6cc97b6e7ac245466a5bc202ed0ebc6e18eb8ce33f2e50c50c81743f02 WHIRLPOOL 609c949de586436e192c54ef886d37ef44122a51470bec9e14cabaf8e14e5641d6384c92e1bde165917b3552c2a58e398011bd9295040bde12e86ec7760e4099
-EBUILD orc-0.4.16.ebuild 1303 SHA256 f9124d8d7e1346e3136ab84b44e0718fdb2d855fedc93ac1d1633323c02fe056 SHA512 dcd6caaf920846e6ee6cdb8d1dae06c22327dc60b5e31744d9bcff8e8607c257fad079db84af829712d56d1c26eb73f64e7c121493e1d0c4b295ce63f7cfd882 WHIRLPOOL ddec433fb189585f457c1e338e5f222ba9ad75be863f49aa11e147b73a0e832e8e0fa3fb41455240d87983de6beea941cc4cc8758c2dc214654f6656c064e469
-EBUILD orc-0.4.9.ebuild 1113 SHA256 38224d8d1d517efa12e504d2827d4c74fd3037a61fbaf44f2c0553a03de83890 SHA512 e49ebc00dffd68c779d346a878f07fecb204f66519b1007cd7a4058f192a12dd27ed71a846bf086baca9f694ab86914bb9c70a4f61eb2d882920726bc5f5402c WHIRLPOOL 0397c9c753c99b7a762a33fe7a06bf6f374189daf07bff84fe391e9348b03681a8a334ea72cb80bfd16900cd617af91cb1a5684ddf1cdff386027ed51b233c1f
-MISC ChangeLog 4269 SHA256 abccf2fd9eb5db19b40f21406ef5e50fa7d45915f94ffbb813ca943f6a3fed96 SHA512 3da1a2e8197612d0a8b98bfff8ccee71cb0ff8dcd4e437210b7c68652bd1cf3ee4c2a407beadd732aa7a1035b566439067e7381c07a7041219d5ee1c6ce3fc6a WHIRLPOOL ede110c398381df1405485ea58ac5ab3af04569a8d96bf8914a87cecc366e70f17959b9c79a2957e5aeefb79e9a6843566ed2177c595a0a7cfbaa7740168edf2
+DIST orc-0.4.17.tar.gz 724990 SHA256 4fc7cca48c59fff23afee78fb642cdbde001f56401c8f47b95a16578d1d5d7e8 SHA512 3a69da6d39e80dd68570aeac341aed692c041c1cfd91abbc36a269167a9b97b5ab539b873dbf800d4735da276e3aa43d664a7efb13559124e0862d2fc2202306 WHIRLPOOL 99f74f986f5c67d622c3bff8b186a7b5b873997bc455c405a50cb3453ebe162a203ffea9acd2e153a47bac19a5dafe3d4050f8b2b5ed6155499be7627ae46b93
+EBUILD orc-0.4.16-r1.ebuild 1375 SHA256 39a4821ee8ada4d8536aa111dde65c62bacfc865222471780c55ab17c68e93f5 SHA512 9128b3de57e18e15a2085f2c7c10634222c3ead8d99312bcb04f942630d9b206c279be1b7512350e9fb1428b6c3f757566ff10c72179f68520636eeb06e1b307 WHIRLPOOL 8794638d73e088aba34ad59a4d178a703c161f49050b32f4ae1244824326a996b9d74ab91caf7aac5f8544b16df7eade2a3b76c41432ef6d3a83b159844b846f
+EBUILD orc-0.4.17.ebuild 1355 SHA256 c047047bc9cc7264c75d717691b8f84faabaff69d5cd11da3064b73175c6bda4 SHA512 577065af6313697299203fbefcf557ad170f53eefaa2c552040fbfd05b9615e0ffb732b1d27d47d1938a834fbbcbd4d7b9a28932aa8341c9835bff281ecc2af4 WHIRLPOOL fb7a760b15b9cea677e64247c229334972cd0ab55b7c9bd711f95eb32c3c4a02e5f83fc457e957fd5043b23def68c043313deb4e3694d2a4fd333e26c22c0cec
+MISC ChangeLog 4712 SHA256 eed29521d2f4d747578c90548f03f7acd7f84f73e4937e2ae6b3602f4320aa14 SHA512 ff9709ef673976dce29d4ad7575612ca89e055951f7e5ce54efbc3b367942c38d5ccf8b45d10f1f9e3f520daa8287f266b3263a4f223424d1d408fa8815eede9 WHIRLPOOL b8694165fee71fb23bdbbaffcb5498f0b5d609c0d7a090c7625ecca473e3cdf1c33c17f31b579387f31d3821d51d7f19ac78d8358e82519b7299e3917358e0c6
 MISC metadata.xml 164 SHA256 63f0c98dbf90a122aa2c9bd6088d3b8a7de6b79f90558e53d175603207f1b01d SHA512 5de3dc5635ad165cdd027b8674ceddb630c486e2458c83fc5f543db675005ca535a4ddcba8b5578861be1ecb358cee1606f7864f20324b41df555006e005afc6 WHIRLPOOL 829c750ce54be5edbc6496df4d4ff40c572d432b8860a237b1c3d3f2e40a44dad2316c44c848a48a1a0583e5155e979dd3a4dfecb2cb6b911d054d31d3b2219d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRfnpYAAoJEJ0WA1zPCt1hLicIAInId8vzMvle5VX/qlB+r2xG
+x613cnFFxfSa3E8jKQ9hML9iOriNKdrkgNxYTNKfqORI3ZmsGVIyksCw5OYEyqLq
+/OCCJ+b1/n9M6RxXoGhbp9OZdeJsMNCs9W8s42f1Ktphq7OInXm5gROBB65WtTMw
+Id24c/ZEddDQx5Z56QmpBl7ccxGokbhuRlttRjfmB8wDOyrArq4cBB4PLWiPOoXs
+/AVIpXSAUvqyjf0iFKp7cjAeVOLME0qdjcYGWFdUSBy+mWiON/ksYXVsvg6kKN8f
+AjHkqTSspmEei9rczFeqBHskEwg52ir/StLJfF7beUV8nKm4NbuJsL3YE05oCcE=
+=/G+T
+-----END PGP SIGNATURE-----
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
-}