3 files changed, 5 insertions, 107 deletions
diff --git a/media-libs/raptor/ChangeLog b/media-libs/raptor/ChangeLog
index 08389672fd75..959edb678df3 100644
--- a/media-libs/raptor/ChangeLog
+++ b/media-libs/raptor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/raptor
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/raptor/ChangeLog,v 1.121 2012/03/30 18:54:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/raptor/ChangeLog,v 1.122 2012/03/30 19:10:56 ssuominen Exp $
+
+  30 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> -raptor-2.0.4.ebuild,
+  -files/raptor-2.0.4-fix_math_test.patch:
+  old
 
 *raptor-2.0.7 (30 Mar 2012)
 
diff --git a/media-libs/raptor/files/raptor-2.0.4-fix_math_test.patch b/media-libs/raptor/files/raptor-2.0.4-fix_math_test.patch
deleted file mode 100644
index 76e698a3564a..000000000000
--- a/media-libs/raptor/files/raptor-2.0.4-fix_math_test.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-This patch is unnecessary for raptor-2.0.5 and above, only to be used with 2.0.4
-
-http://bugs.gentoo.org/show_bug.cgi?id=377253#c12
-
---- a/configure.ac	2011-09-10 22:31:37.791042002 -0700
-+++ b/configure.ac	2011-09-10 22:51:12.789352501 -0700
-@@ -407,8 +407,12 @@
- #ifdef HAVE_MATH_H
- #include <math.h>
- #endif
-+#ifdef HAVE_STDLIB_H
-+#include <stdlib.h>
-+#endif
- ]], [[
--double d = trunc(1.0F) + round(1.0F);
-+double t = atof("0.000");
-+return (int)(trunc(t) * round(t));
- ]])],
-    AC_MSG_RESULT(yes)
-    trunc_round_lib=libc,
-@@ -421,8 +425,12 @@
- #ifdef HAVE_MATH_H
- #include <math.h>
- #endif
-+#ifdef HAVE_STDLIB_H
-+#include <stdlib.h>
-+#endif
- ]], [[
--double d = trunc(1.0F) + round(1.0F);
-+double t = atof("0.000");
-+return (int)(trunc(t) * round(t));
- ]])],
-      AC_MSG_RESULT(yes)
-      need_libm=1
diff --git a/media-libs/raptor/raptor-2.0.4.ebuild b/media-libs/raptor/raptor-2.0.4.ebuild
deleted file mode 100644
index cace4102b237..000000000000
--- a/media-libs/raptor/raptor-2.0.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/raptor/raptor-2.0.4.ebuild,v 1.7 2011/10/18 16:51:50 ssuominen Exp $
-
-EAPI=4
-inherit autotools eutils libtool
-
-MY_P=${PN}2-${PV}
-
-DESCRIPTION="The RDF Parser Toolkit"
-HOMEPAGE="http://librdf.org/raptor/"
-SRC_URI="http://download.librdf.org/source/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
-SLOT="2"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+curl debug json static-libs unicode +xml"
-
-RDEPEND="unicode? ( dev-libs/glib:2 )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	!xml? ( dev-libs/expat )
-	curl? ( net-misc/curl )
-	json? ( dev-libs/yajl )
-	dev-libs/libxslt
-	!<media-libs/raptor-1.4.21-r1"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/flex
-	dev-util/gtk-doc-am" # remove once eautoreconf is gone
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS ChangeLog NEWS NOTICE README )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix_math_test.patch
-	eautoreconf # only for -fix_math_test.patch
-	epunt_cxx
-	elibtoolize
-}
-
-src_configure() {
-	local myconf
-
-	if use xml; then
-		myconf+=" --with-xml-parser=libxml"
-	else
-		myconf+=" --with-xml-parser=expat"
-	fi
-
-	if use curl; then
-		myconf+=" --with-www=curl"
-	elif use xml; then
-		myconf+=" --with-www=xml"
-	else
-		myconf+=" --with-www=none"
-	fi
-
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable unicode nfc-check) \
-		$(use_enable debug) \
-		$(use_with json yajl) \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		${myconf}
-}
-
-src_install() {
-	default
-	dohtml {NEWS,README,RELEASE,UPGRADING}.html
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}