media-libs/exempi: Version bump. Improved boost.m4 patch (submitted to the boost...

svn path=/sunrise/; revision=5566

diff --git a/media-libs/exempi/ChangeLog b/media-libs/exempi/ChangeLog
index 7a3dd927fe3f74fa5b0501959c0e228714298aec..e3c3e03b942a81960c2ce95178c3db7670df67dd 100644 (file)
--- a/media-libs/exempi/ChangeLog
+++ b/media-libs/exempi/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  31 Jan 2008; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com>
+  -files/exempi-1.99.7-boost_mt.patch,
+  +files/exempi-1.99.9-boost.m4.BOOST_FIND_LIB.patch, -exempi-1.99.7.ebuild,
+  +exempi-1.99.9.ebuild:
+  Version bump. Improved boost.m4 patch (submitted to the boost.m4 upstream).
+
   15 Jan 2008; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com>
   +files/exempi-1.99.7-boost_mt.patch, +metadata.xml, +exempi-1.99.7.ebuild:
   New ebuild for bug 185689

diff --git a/media-libs/exempi/Manifest b/media-libs/exempi/Manifest
index 416d8d8c8b988dc417bc5d460e965682986f13f0..0577067f8f1e35f1f43b1a1820e750483f12286a 100644 (file)
--- a/media-libs/exempi/Manifest
+++ b/media-libs/exempi/Manifest
@@ -1,5 +1,5 @@
-AUX exempi-1.99.7-boost_mt.patch 502 RMD160 c3905924fb48c2fea8bb56240c3d47dd6f0ef24e SHA1 98d26c775901e7062fa3234fa8d7d3d1e0bd2f75 SHA256 af087de612f16b0c0d8d12217a4c3f21257807993f41e4cd2f69b774a230d932
-DIST exempi-1.99.7.tar.gz 3062514 RMD160 15d714dc807e8ca42e8b4d55ece87bdc472022cf SHA1 8789ce16934d1930089ee6c869160d9a0aee2e70 SHA256 9f77656c33522c2d59f50f6551463ac57ff60450ff5ef1500fe34d79292005e9
-EBUILD exempi-1.99.7.ebuild 1128 RMD160 9ea8f6913d0fcdd93f4da12ac44432626f02258e SHA1 3c4857fde754a2d19f398cc2c45a09feaece7289 SHA256 8e3c062f2c571d5de549b41279ce7d591a5940ab9098656d02ed2b0cf3949df5
-MISC ChangeLog 294 RMD160 b512909b330c45657d69f64fb8eadf9d82d533cd SHA1 f3879e4403b862ae6afe056c6d367611054b39de SHA256 5d980e1a348a13f61855af51739a1ae7dfd91007325d21b566dbb3d1a79aabea
+AUX exempi-1.99.9-boost.m4.BOOST_FIND_LIB.patch 1581 RMD160 db616ca5350ea5797ca5b2d2d87fcaf873d55c0a SHA1 e6c390e51e05edc791cae8c452b35c70bbbebf12 SHA256 07814bd41c67f7860080b8fc55fbed804359de2c4fbbacccd8238ee6a900e4a5
+DIST exempi-1.99.9.tar.gz 3063146 RMD160 3034b535a0fdd9334fc42e71935b9551d0c3480e SHA1 2eabbe9c6c2089cce8579cde2aed40a5cba9329a SHA256 10104ff8405604b32583fb8c8731c038525aeacf6c4a44f2845649964a3c9a7b
+EBUILD exempi-1.99.9.ebuild 1183 RMD160 4fd50943241c7bc567e4d9334d673e4a82f009b2 SHA1 7265c75c4bdcdbf34ea1f05b8b1df17c58cfc615 SHA256 20434e385972360b8b15fe2b0e9b6795d57c3f316de493c96d09e9731b5b99bd
+MISC ChangeLog 584 RMD160 3e794a934d07abc7b16783805f3d66e241ba9c2f SHA1 3163902df5fd3d4153378253b18dc217c6dce78f SHA256 afd9a8cb915f3f1e83038226bdf5a3176299ade530a26fc00329357bd7207adf
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/media-libs/exempi/exempi-1.99.7.ebuild b/media-libs/exempi/exempi-1.99.9.ebuild
similarity index 72%
rename from media-libs/exempi/exempi-1.99.7.ebuild
rename to media-libs/exempi/exempi-1.99.9.ebuild
index 933ca5c3029110cf5c271ebd30ee031ec1a4ae57..c29c5aa1012b0038cb96d629379f008d11509861 100644 (file)
--- a/media-libs/exempi/exempi-1.99.7.ebuild
+++ b/media-libs/exempi/exempi-1.99.9.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit autotools
+inherit autotools eutils
 
 DESCRIPTION="exempi is a port of the Adobe XMP SDK to work on UNIX"
 HOMEPAGE="http://libopenraw.freedesktop.org/wiki/Exempi"
@@ -16,21 +16,20 @@ IUSE="examples test"
 RDEPEND="dev-libs/expat
        virtual/libiconv"
 DEPEND="${RDEPEND}
-       test? ( >=dev-libs/boost-1.33.1 dev-util/valgrind )"
+       test? ( >=dev-libs/boost-1.33.0 dev-util/valgrind )"
 
 src_unpack() {
        unpack "${A}"
        cd "${S}"
-       if use test ; then
-               epatch "${FILESDIR}/${P}-boost_mt.patch"
-       else
-               sed -e '/^BOOST/ D' -i configure.ac
+       #don't waste time on autoreconf for those who don't want to run unit tests
+       if use test; then
+               epatch "${FILESDIR}/${P}-boost.m4.BOOST_FIND_LIB.patch"
+               AT_M4DIR=m4 eautoreconf
        fi
-       AT_M4DIR=m4 eautoreconf
 }
 
 src_compile() {
-       econf $(use_with test unit-test) || die "./configure failed"
+       econf $(use_enable test unittest) || die "./configure failed"
        emake || die "emake failed"
 }
 

diff --git a/media-libs/exempi/files/exempi-1.99.7-boost_mt.patch b/media-libs/exempi/files/exempi-1.99.7-boost_mt.patch
deleted file mode 100644 (file)
index 74aea16..0000000
--- a/media-libs/exempi/files/exempi-1.99.7-boost_mt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru exempi-1.99.7.orig/m4/boost.m4 exempi-1.99.7/m4/boost.m4
---- exempi-1.99.7.orig/m4/boost.m4     2007-12-22 13:17:33.000000000 -0500
-+++ exempi-1.99.7/m4/boost.m4  2008-01-14 17:57:20.475741830 -0500
-@@ -260,7 +260,6 @@
-     boost_$1$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \
-     boost_$1$boost_tag_$boost_mt_$boost_ver_ \
-     boost_$1$boost_tag_$boost_rtopt_$boost_ver_ \
--    boost_$1$boost_tag_$boost_mt_ \
-     boost_$1$boost_tag_$boost_ver_
-   do
-     # Avoid testing twice the same lib

diff --git a/media-libs/exempi/files/exempi-1.99.9-boost.m4.BOOST_FIND_LIB.patch b/media-libs/exempi/files/exempi-1.99.9-boost.m4.BOOST_FIND_LIB.patch
new file mode 100644 (file)
index 0000000..23592d3
--- /dev/null
+++ b/media-libs/exempi/files/exempi-1.99.9-boost.m4.BOOST_FIND_LIB.patch
@@ -0,0 +1,35 @@
+--- orig/m4/boost.m4   2008-01-22 18:46:39.000000000 -0500
++++ new/m4/boost.m4    2008-01-26 01:53:00.000000000 -0500
+@@ -227,10 +227,15 @@
+     mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X$2" : 'Xmt-*\(.*\)'`;; #(
+     *) boost_mt=; boost_rtopt=$2;;
+   esac
+-  # If the PREFERRED-RT-OPT are not empty, prepend a `-'.
++  # Find the proper debug variant depending on what we've been asked to find.
+   case $boost_rtopt in #(
+-    *[[a-z0-9A-Z]]*) boost_rtopt="-$boost_rtopt";;
++    *d*) boost_rt_d="-$boost_rtopt";; #(
++    *[[sgpn]]*) # Insert the `d' at the right place (in between `sg' and `pn')
++      boost_rt_d=`echo "$boost_rtopt" | sed 's/\(s*g*\)\(p*n*\)/-\1d\2/'`;; #(
++    *) boost_rt_d='-d';;
+   esac
++  # If the PREFERRED-RT-OPT are not empty, prepend a `-'.
++  test -n "$boost_rtopt" && boost_rtopt="-$boost_rtopt"
+   $boost_guess_use_mt && boost_mt=-mt
+   # Look for the abs path the static archive.
+   # $libext is computed by Libtool but let's make sure it's non empty.
+@@ -266,12 +271,11 @@
+ for boost_tag_ in -$boost_cv_lib_tag ''; do
+ for boost_ver_ in -$boost_cv_lib_version ''; do
+ for boost_mt_ in $boost_mt -mt ''; do
+-for boost_rtopt_ in $boost_rtopt '' -d; do
++for boost_rtopt_ in $boost_rtopt $boost_rt_d; do
+   for boost_lib in \
+     boost_$1$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \
+-    boost_$1$boost_tag_$boost_mt_$boost_ver_ \
+     boost_$1$boost_tag_$boost_rtopt_$boost_ver_ \
+-    boost_$1$boost_tag_$boost_mt_ \
++    boost_$1$boost_tag_$boost_mt_$boost_ver_ \
+     boost_$1$boost_tag_$boost_ver_
+   do
+     # Avoid testing twice the same lib