Disable ljpegtest, broken with boost-1.34.1 adding a comments to ebuild, linking to upstream bugs. Thanks to aballier at gentoo.org for reporting.

Package-Manager: portage-2.1.4_rc9

4 files changed, 56 insertions, 13 deletions

diff --git a/media-libs/libopenraw/ChangeLog b/media-libs/libopenraw/ChangeLog
index 8752887d6f89..b9674f87c055 100644
--- a/media-libs/libopenraw/ChangeLog
+++ b/media-libs/libopenraw/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libopenraw
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libopenraw/ChangeLog,v 1.14 2007/12/11 15:50:37 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libopenraw/ChangeLog,v 1.15 2007/12/14 18:36:59 drac Exp $
+
+  14 Dec 2007; Samuli Suominen <drac@gentoo.org>
+  +files/libopenraw-0.0.3-disable-ljpegtest.patch, libopenraw-0.0.3.ebuild:
+  Disable ljpegtest, broken with boost-1.34.1 adding a comments to ebuild,
+  linking to upstream bugs. Thanks to aballier at gentoo.org for reporting.
 
 *libopenraw-0.0.3 (11 Dec 2007)
 
diff --git a/media-libs/libopenraw/Manifest b/media-libs/libopenraw/Manifest
index 833680f4d6f4..034307ad89de 100644
--- a/media-libs/libopenraw/Manifest
+++ b/media-libs/libopenraw/Manifest
@@ -1,17 +1,21 @@
+AUX libopenraw-0.0.3-disable-ljpegtest.patch 874 RMD160 c741e5b024f6ba132bd86efe339d5cae3f8cd050 SHA1 a5038f9dcc6d70e1d9a7a6833d096b63aad3f26b SHA256 98e7ec57649d976f4fb8c775f7fdcfdc8de0deca02572baaf772e9a9516717b8
+MD5 304d7f752e949327e989a02aed073534 files/libopenraw-0.0.3-disable-ljpegtest.patch 874
+RMD160 c741e5b024f6ba132bd86efe339d5cae3f8cd050 files/libopenraw-0.0.3-disable-ljpegtest.patch 874
+SHA256 98e7ec57649d976f4fb8c775f7fdcfdc8de0deca02572baaf772e9a9516717b8 files/libopenraw-0.0.3-disable-ljpegtest.patch 874
 DIST libopenraw-0.0.2.tar.gz 388136 RMD160 0fe9746bc4dc58c192a3dea62aa3855553becc6c SHA1 02bd67133e967fe9bb300432a7621305d73d72ef SHA256 2c3f58a4dff1b74ad93da0468d8806207488134d51b2d81947932a1bca8553ae
 DIST libopenraw-0.0.3.tar.gz 498161 RMD160 298366d0bd8fd32984bffd5b2489686b52702758 SHA1 f60569414d383b5a08b7eb88477b11169ab605d3 SHA256 a85fc5e1679b2e4c541d7ef1a97eec7028cd72c8230171e2a65b7e1af2a61342
 EBUILD libopenraw-0.0.2.ebuild 797 RMD160 a4f67873781ef0af411684a0331078a8f538eef3 SHA1 bcb9ee4fda097cc52ac03d7f76e1ef402d3d2d7b SHA256 746847cac848e9566fccc3bc5ab8e9110e3308c4162c513d33b8f41eae814d23
 MD5 fb71efa8105168de907b68da4db61166 libopenraw-0.0.2.ebuild 797
 RMD160 a4f67873781ef0af411684a0331078a8f538eef3 libopenraw-0.0.2.ebuild 797
 SHA256 746847cac848e9566fccc3bc5ab8e9110e3308c4162c513d33b8f41eae814d23 libopenraw-0.0.2.ebuild 797
-EBUILD libopenraw-0.0.3.ebuild 1005 RMD160 baaac95697bf1721ce4779be49872974fbdfb538 SHA1 b3851aa6639a10fe925c4d967e8be76ae13ee52f SHA256 9773d715df2d08860b7fc3c4f23549d6e2914d59341871d0d652d432e86c82e7
-MD5 bed94a553ed9f6ab7b6847c86125e299 libopenraw-0.0.3.ebuild 1005
-RMD160 baaac95697bf1721ce4779be49872974fbdfb538 libopenraw-0.0.3.ebuild 1005
-SHA256 9773d715df2d08860b7fc3c4f23549d6e2914d59341871d0d652d432e86c82e7 libopenraw-0.0.3.ebuild 1005
-MISC ChangeLog 1755 RMD160 10a70364667cb3bbe0785a12beb78febd6c30d55 SHA1 d57dcf140f5ef2077e49531b4b868cefc4e5f011 SHA256 00dc56fb9174c55b0acbea6eff9fd8f64867cc819fdcc6a7c6437f5ba28689d7
-MD5 ecc2e498433a6e08c41fe299541303ef ChangeLog 1755
-RMD160 10a70364667cb3bbe0785a12beb78febd6c30d55 ChangeLog 1755
-SHA256 00dc56fb9174c55b0acbea6eff9fd8f64867cc819fdcc6a7c6437f5ba28689d7 ChangeLog 1755
+EBUILD libopenraw-0.0.3.ebuild 1123 RMD160 03f38427a81124eca5abb868affda6fe1e838a7c SHA1 7ec3c391f6c71ab0cccc736d903453f8681b360b SHA256 0fb9c64c329e2ce5016bee033b5ad26337682e61ddb360336d0bfc35ac4bfe49
+MD5 3b092d5383110938c43395dae389d7d2 libopenraw-0.0.3.ebuild 1123
+RMD160 03f38427a81124eca5abb868affda6fe1e838a7c libopenraw-0.0.3.ebuild 1123
+SHA256 0fb9c64c329e2ce5016bee033b5ad26337682e61ddb360336d0bfc35ac4bfe49 libopenraw-0.0.3.ebuild 1123
+MISC ChangeLog 2032 RMD160 446b55d2ea92448f6d89446bc7e5e273e85ae13f SHA1 43ba257595574b9e5bb91d81bd0842f09a326878 SHA256 ff654b95c1b8e607d07c9bf239c3f872630ffa32324e7e46e96b993fd36bf80d
+MD5 282410e2fe60bd8c313fee25edb62a58 ChangeLog 2032
+RMD160 446b55d2ea92448f6d89446bc7e5e273e85ae13f ChangeLog 2032
+SHA256 ff654b95c1b8e607d07c9bf239c3f872630ffa32324e7e46e96b993fd36bf80d ChangeLog 2032
 MISC metadata.xml 216 RMD160 0c4bfda84d05f1a28b0aaa650a83f53d27bc35ed SHA1 dcce3bae2bfb9005d133e79d945cec2f547dc539 SHA256 c5c5e9c4cd00697ae0548067434717948bbac9577a7bf5e0afbb27b43f4b453b
 MD5 7654aa45fc8ab2f54056e40e03d67841 metadata.xml 216
 RMD160 0c4bfda84d05f1a28b0aaa650a83f53d27bc35ed metadata.xml 216
diff --git a/media-libs/libopenraw/files/libopenraw-0.0.3-disable-ljpegtest.patch b/media-libs/libopenraw/files/libopenraw-0.0.3-disable-ljpegtest.patch
new file mode 100644
index 000000000000..50aa95535ce2
--- /dev/null
+++ b/media-libs/libopenraw/files/libopenraw-0.0.3-disable-ljpegtest.patch
@@ -0,0 +1,29 @@
+diff -ur libopenraw-0.0.3.orig/test/Makefile.am libopenraw-0.0.3/test/Makefile.am
+--- libopenraw-0.0.3.orig/test/Makefile.am	2007-11-25 21:16:09.000000000 +0200
++++ libopenraw-0.0.3/test/Makefile.am	2007-12-14 20:28:59.000000000 +0200
+@@ -1,5 +1,5 @@
+ 
+-TESTS = fileio ljpegtest
++TESTS = fileio
+ TESTS_ENVIRONMENT =
+ 
+ OPENRAW_LIB = $(top_builddir)/lib/libopenraw.la
+@@ -8,9 +8,7 @@
+ 	-I$(top_srcdir)/include \
+ 	-I$(top_srcdir)/lib
+ 
+-check_PROGRAMS = fileio ciffcontainertest ljpegtest
+-
+-EXTRA_DIST = ljpegtest1.jpg
++check_PROGRAMS = fileio ciffcontainertest
+ 
+ fileio_LDFLAGS = -L$(top_builddir)/lib/io
+ fileio_LDADD = -lio
+@@ -18,7 +16,3 @@
+ 
+ ciffcontainertest_SOURCES = ciffcontainertest.cpp
+ ciffcontainertest_LDADD = $(OPENRAW_LIB)
+-
+-ljpegtest_SOURCES = ljpegtest.cpp
+-ljpegtest_LDFLAGS = -static
+-ljpegtest_LDADD = $(OPENRAW_LIB) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
diff --git a/media-libs/libopenraw/libopenraw-0.0.3.ebuild b/media-libs/libopenraw/libopenraw-0.0.3.ebuild
index 9bebed0e7b41..5ff247fbdd85 100644
--- a/media-libs/libopenraw/libopenraw-0.0.3.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.0.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libopenraw/libopenraw-0.0.3.ebuild,v 1.1 2007/12/11 15:50:37 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libopenraw/libopenraw-0.0.3.ebuild,v 1.2 2007/12/14 18:36:59 drac Exp $
 
-inherit autotools
+inherit autotools eutils
 
 DESCRIPTION="Decoding library for RAW image formats"
 HOMEPAGE="http://libopenraw.freedesktop.org"
@@ -22,9 +22,14 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	# Fix linking with -Wl,--as-needed for configure.
+
+	# http://bugs.freedesktop.org/show_bug.cgi?id=13658
 	sed -i -e 's:LDFLAGS:LIBS:g' m4/ax_boost_unit_test_framework.m4
-	AT_M4DIR="m4" eautoconf
+
+	# http://bugs.freedesktop.org/show_bug.cgi?id=13659
+	epatch "${FILESDIR}"/${P}-disable-ljpegtest.patch
+
+	AT_M4DIR="m4" eautoreconf
 }
 
 src_compile() {