Version bump. Upstream supposedly integrated some crosscompile patch but still didn't get it right.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 157 insertions, 2 deletions

diff --git a/media-libs/libart_lgpl/ChangeLog b/media-libs/libart_lgpl/ChangeLog
index 35da2ab4e87e..fa250294bffc 100644
--- a/media-libs/libart_lgpl/ChangeLog
+++ b/media-libs/libart_lgpl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/libart_lgpl
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libart_lgpl/ChangeLog,v 1.63 2009/09/07 22:07:33 eva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libart_lgpl/ChangeLog,v 1.64 2010/04/06 13:54:35 eva Exp $
+
+*libart_lgpl-2.3.21 (06 Apr 2010)
+
+  06 Apr 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  +libart_lgpl-2.3.21.ebuild, +files/libart_lgpl-2.3.21-crosscompile.patch,
+  +files/libart_lgpl-2.3.21-no-test-build.patch:
+  Version bump. Upstream supposedly integrated some crosscompile patch but
+  still didn't get it right.
 
   07 Sep 2009; Gilles Dartiguelongue <eva@gentoo.org>
   -libart_lgpl-2.3.19-r1.ebuild:
diff --git a/media-libs/libart_lgpl/files/libart_lgpl-2.3.21-crosscompile.patch b/media-libs/libart_lgpl/files/libart_lgpl-2.3.21-crosscompile.patch
new file mode 100644
index 000000000000..152e9d501e6a
--- /dev/null
+++ b/media-libs/libart_lgpl/files/libart_lgpl-2.3.21-crosscompile.patch
@@ -0,0 +1,79 @@
+From e1443c945a4cf67096d8c27721aadd7368382b3f Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Tue, 6 Apr 2010 15:22:25 +0200
+Subject: [PATCH 2/2] gentoo: use ISO types for fixed type size
+
+---
+ Makefile.am  |   11 ++---------
+ art_config.h |    5 +++++
+ configure.in |   10 ----------
+ 3 files changed, 7 insertions(+), 19 deletions(-)
+ create mode 100644 art_config.h
+
+diff --git a/Makefile.am b/Makefile.am
+index 95952da..6aa2fe3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,13 +2,6 @@ check_PROGRAMS = testart testuta
+ 
+ bin_SCRIPTS = \
+ 	libart2-config
+-	
+-noinst_SCRIPTS = gen_art_config.sh
+-
+-BUILT_SOURCES = art_config.h
+-
+-art_config.h:
+-	./gen_art_config.sh > art_config.h
+ 
+ EXTRA_DIST = 			\
+ 	libart.def		\
+@@ -173,5 +166,5 @@ install-data-local: install-ms-lib install-libtool-import-lib
+ 
+ uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
+ 
+-CLEANFILES = $(BUILT_SOURCES) $(bin_SCRIPTS)
+-DISTCLEANFILES = $(BUILT_SOURCES) $(bin_SCRIPTS)
++CLEANFILES = $(bin_SCRIPTS)
++DISTCLEANFILES = $(bin_SCRIPTS)
+diff --git a/art_config.h b/art_config.h
+new file mode 100644
+index 0000000..5985f1f
+--- a/art_config.h
++++ b/art_config.h
+@@ -0,0 +1,5 @@
++#include <stdint.h>
++
++typedef uint8_t art_u8;
++typedef uint16_t art_u16;
++typedef uint32_t art_u32;
+diff --git a/configure.in b/configure.in
+index e4804f7..ddcac4f 100644
+--- a/configure.in
++++ b/configure.in
+@@ -92,15 +92,6 @@ AC_FUNC_ALLOCA
+ 
+ AC_C_BIGENDIAN
+ 
+-AC_CHECK_SIZEOF(char)
+-AC_SUBST(ART_SIZEOF_CHAR, $ac_cv_sizeof_char)
+-AC_CHECK_SIZEOF(short)
+-AC_SUBST(ART_SIZEOF_SHORT, $ac_cv_sizeof_short)
+-AC_CHECK_SIZEOF(int)
+-AC_SUBST(ART_SIZEOF_INT, $ac_cv_sizeof_int)
+-AC_CHECK_SIZEOF(long)
+-AC_SUBST(ART_SIZEOF_LONG, $ac_cv_sizeof_long)
+-
+ AC_CONFIG_FILES([
+ libart-features.h
+ Makefile
+@@ -109,6 +100,5 @@ libart-2.0-uninstalled.pc
+ libart-zip])
+ 
+ AC_CONFIG_FILES([libart-config],[chmod +x libart-config])
+-AC_CONFIG_FILES([gen_art_config.sh],[chmod +x gen_art_config.sh])
+ 
+ AC_OUTPUT
+-- 
+1.7.0.4
+
diff --git a/media-libs/libart_lgpl/files/libart_lgpl-2.3.21-no-test-build.patch b/media-libs/libart_lgpl/files/libart_lgpl-2.3.21-no-test-build.patch
new file mode 100644
index 000000000000..0937d9091762
--- /dev/null
+++ b/media-libs/libart_lgpl/files/libart_lgpl-2.3.21-no-test-build.patch
@@ -0,0 +1,22 @@
+From f3afed3b06c34c588a7c67cb83064e16255f54b4 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Tue, 6 Apr 2010 15:11:46 +0200
+Subject: [PATCH 1/2] gentoo: do not build tests if not required
+
+---
+ Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index aec6c5d..95952da 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-noinst_PROGRAMS = testart testuta
++check_PROGRAMS = testart testuta
+ 
+ bin_SCRIPTS = \
+ 	libart2-config
+-- 
+1.7.0.4
+
diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.21.ebuild b/media-libs/libart_lgpl/libart_lgpl-2.3.21.ebuild
new file mode 100644
index 000000000000..54b242883d71
--- /dev/null
+++ b/media-libs/libart_lgpl/libart_lgpl-2.3.21.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libart_lgpl/libart_lgpl-2.3.21.ebuild,v 1.1 2010/04/06 13:54:35 eva Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="a LGPL version of libart"
+HOMEPAGE="http://www.levien.com/libart"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-util/pkgconfig"
+
+# The provided tests are interactive only
+RESTRICT="test"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF} --disable-static"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix crosscompiling, bug #185684
+	rm "${S}"/art_config.h
+	epatch "${FILESDIR}"/${PN}-2.3.21-crosscompile.patch
+
+	# Do not build tests if not required
+	epatch "${FILESDIR}"/${PN}-2.3.21-no-test-build.patch
+
+	eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+	find "${D}" -name "*.la" -delete || die "failed *.la removal"
+}