Version bump.

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

6 files changed, 37 insertions, 101 deletions

diff --git a/media-libs/exempi/ChangeLog b/media-libs/exempi/ChangeLog
index 3e0d824bf190..6fb6fe8b4cbe 100644
--- a/media-libs/exempi/ChangeLog
+++ b/media-libs/exempi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/exempi
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/exempi/ChangeLog,v 1.17 2009/05/17 22:14:17 eva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/exempi/ChangeLog,v 1.18 2010/02/17 08:29:58 ssuominen Exp $
+
+*exempi-2.1.1 (17 Feb 2010)
+
+  17 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> +exempi-2.1.1.ebuild,
+  metadata.xml:
+  Version bump. Change gnome to freedesktop-bugs in metadata.xml.
 
 *exempi-2.1.0 (17 May 2009)
 
diff --git a/media-libs/exempi/Manifest b/media-libs/exempi/Manifest
index 1ec60743ed6f..92475c85c3eb 100644
--- a/media-libs/exempi/Manifest
+++ b/media-libs/exempi/Manifest
@@ -1,19 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX exempi-1.99.9-boost.m4.BOOST_FIND_LIB.patch 1581 RMD160 db616ca5350ea5797ca5b2d2d87fcaf873d55c0a SHA1 e6c390e51e05edc791cae8c452b35c70bbbebf12 SHA256 07814bd41c67f7860080b8fc55fbed804359de2c4fbbacccd8238ee6a900e4a5
 AUX exempi-2.0.2-gcc44.patch 665 RMD160 4c2fc738732cc4a9aee84976759015e96ced0ee8 SHA1 705e6ac6cf2249570b3880c41b15037573911462 SHA256 094c18c6937842da4df0fd609533686af7852ef65211421e3ee23297dcb3ade9
-AUX exempi-2.1.0-gcc44.patch 1497 RMD160 ecf16bcec5d328c7a7b98233773bb040fa5d9a52 SHA1 216966766847d0e9d0a96933382cc078c0b3e0c0 SHA256 26b79fed563d8977ae5dbbd0d468672a9596e6eee415a2f0e193fd461c380aff
 DIST exempi-2.0.2.tar.gz 3072078 RMD160 f8e97ae152ee8ad69ccbccdea071fa590cd73e1b SHA1 46432ccefcbf6d842afcedff22a1c24a823cb4e2 SHA256 394c90599fc2f402ce77cbff9d16da4ae284ae0070c13a37543ade68752d7975
-DIST exempi-2.1.0.tar.gz 3398767 RMD160 4d2734a68ba4eb5522474a3cd4b9e9850c8f5672 SHA1 b85feac36f32b15be17b8d76240b848b8801fbc5 SHA256 bf1f76dda3d796fc9af530c9761dec4c67681def826c25cbaccc8aeb5816c95f
-EBUILD exempi-2.0.2.ebuild 1278 RMD160 3c8f4ba89ad1320e9a5b20030aaaf8896f39da1d SHA1 a86437b36bf5dd191a28076cc526ca693fb34995 SHA256 baf499e16b3ad468a3dd2950deefd7b23ccbc1f670e2ee61c106ee570e8a106f
-EBUILD exempi-2.1.0.ebuild 1410 RMD160 41f0de864ce3047dfbb0434239bacdf8132d00d0 SHA1 ddce6d61c0407a747eaa5d1a23a7f30d4eb55737 SHA256 0876da069e3b7a91cf021dc2d1b3001fc9cdd8ec664d6c1ea5f6b9ccf906fb50
-MISC ChangeLog 2331 RMD160 c6804260c9d2465413a6bf09a7308e1382616a29 SHA1 7cb047756a8f3b056a4f36ade468ad13a5bf6da5 SHA256 baf60f803806c0ff5a7539355cbf11f32e2714374a4a110d0278eb48d4428cf0
-MISC metadata.xml 242 RMD160 c410573a1fead75c95c1ba5fe755464aa764fdcd SHA1 443db5bcbd9c1cd03667500c6d735ac3df555889 SHA256 147ed889549123684b023511847fe815d9fe21e814c3d2a328418b74de7f089b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoQjD8ACgkQ1fmVwcYIWAZI0gCgldKVXhsVJnmbvEJtyn5vwdZA
-JJQAoJOaZ/HwWmztO/3wwwn/5uMDjLLg
-=itfp
------END PGP SIGNATURE-----
+DIST exempi-2.1.1.tar.gz 3401564 RMD160 e79500f804e162df340e669deea620408e4926b4 SHA1 f05a4c1d609c0e3cafdf839c16ec46afae1b160d SHA256 b06b67472ff673e2d4257ae0b687ba421af1f9952428e7caead870868c2a4dd3
+EBUILD exempi-2.0.2.ebuild 1341 RMD160 6f1d2d49b24592fd1d1ef3ac1e4e651ec5871717 SHA1 b12d524fe079f5f8ae552dc5ce3d65a230ff02c1 SHA256 74ba45403fb48ca9ddb31f786d08e09dde0e48d06bd6b97b6a4586668d74d9dc
+EBUILD exempi-2.1.1.ebuild 1172 RMD160 0c199f2c3ae0d75dbfd988eb40fa8102bd03008f SHA1 45ec8c6565eaddc37d9b6e133f72291c6abc8552 SHA256 680c733559909deb0afb00718bd53e179c35051c1ff006804a375f2fc3939d27
+MISC ChangeLog 2525 RMD160 ef081c2cc121aee3be6c046cb88a9e1f058898d2 SHA1 77a5343a1dd471dd676da2b0c35c54efb8a78f9d SHA256 ed54998c7505a24cac888a39b0ebf1b8bdd4320c0c7b21c31142e1d4b95eb8c4
+MISC metadata.xml 244 RMD160 244bfcdb5c3c5eab051189d8adf5e572866b8c64 SHA1 580ce8a447f3237ea98b1d289b440bc89245e89b SHA256 552982cb042dce6d0051aef928f3cca7553e6d7327e0556f97f9e6e52e651b6c
diff --git a/media-libs/exempi/exempi-2.0.2.ebuild b/media-libs/exempi/exempi-2.0.2.ebuild
index e1deeefe5c5a..ed9527bfdd87 100644
--- a/media-libs/exempi/exempi-2.0.2.ebuild
+++ b/media-libs/exempi/exempi-2.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/exempi/exempi-2.0.2.ebuild,v 1.16 2009/05/11 16:02:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/exempi/exempi-2.0.2.ebuild,v 1.17 2010/02/17 08:29:58 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils
@@ -19,6 +19,9 @@ RDEPEND="dev-libs/expat
 DEPEND="${RDEPEND}
 	test? ( >=dev-libs/boost-1.33 )"
 
+# Unrestricted again in 2.1.1. Known to fail.
+RESTRICT="test"
+
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gcc44.patch
 
diff --git a/media-libs/exempi/exempi-2.1.0.ebuild b/media-libs/exempi/exempi-2.1.1.ebuild
index 3351af02af55..e5a28af41926 100644
--- a/media-libs/exempi/exempi-2.1.0.ebuild
+++ b/media-libs/exempi/exempi-2.1.1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/exempi/exempi-2.1.0.ebuild,v 1.1 2009/05/17 22:14:18 eva Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/media-libs/exempi/exempi-2.1.1.ebuild,v 1.1 2010/02/17 08:29:58 ssuominen Exp $
 
+EAPI=2
 inherit autotools eutils
 
 DESCRIPTION="Exempi is a port of the Adobe XMP SDK to work on UNIX"
@@ -15,18 +14,13 @@ SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="examples test"
 
-# Could only run tests with boot 1.37
 RDEPEND="dev-libs/expat
 	virtual/libiconv
 	sys-libs/zlib"
 DEPEND="${RDEPEND}
-	test? ( >=dev-libs/boost-1.37.0 )"
+	test? ( >=dev-libs/boost-1.37 )"
 
 src_prepare() {
-	# Fix build with gcc 4.4, bug #267466
-	epatch "${FILESDIR}/${P}-gcc44.patch"
-
-	# don't waste time on autoreconf for those who don't want to run unit tests
 	if use test; then
 		epatch "${FILESDIR}/${PN}-1.99.9-boost.m4.BOOST_FIND_LIB.patch"
 		eautoreconf
@@ -34,20 +28,19 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_enable test unittest)
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable test unittest)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-
-	if use examples ; then
-		cd samples/source
-		emake distclean
-		cd "${S}"
-		rm samples/Makefile* samples/source/Makefile* \
-			samples/testfiles/Makefile*
-		insinto "/usr/share/doc/${PF}"
-		doins -r samples || die "doins failed"
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO || die
+
+	if use examples; then
+		emake -C samples/source distclean
+		rm -f samples/{,source,testfiles}/Makefile*
+		insinto /usr/share/doc/${PF}/examples
+		doins -r samples/* || die
 	fi
 }
diff --git a/media-libs/exempi/files/exempi-2.1.0-gcc44.patch b/media-libs/exempi/files/exempi-2.1.0-gcc44.patch
deleted file mode 100644
index befe651eafa2..000000000000
--- a/media-libs/exempi/files/exempi-2.1.0-gcc44.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 9c751b6f0f09cf6605af49bb2a6c90e7b7468d65 Mon Sep 17 00:00:00 2001
-From: Michael Biebl <biebl@debian.org>
-Date: Mon, 29 Dec 2008 00:35:38 +0100
-Subject: [PATCH] fix build failures with GCC 4.4
-
-- Add missing includes to fix FTBFS with GCC 4.4. See Debian
-Bug#504944
-
-Signed-off-by: Hubert Figuiere <hub@figuiere.net>
----
- exempi/tests/utils.cpp              |    1 +
- samples/source/XMPFilesCoverage.cpp |    1 +
- source/common/XML_Node.cpp          |    1 +
- 3 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/exempi/tests/utils.cpp b/exempi/tests/utils.cpp
-index 64be1ee..ee1c3a9 100644
---- a/exempi/tests/utils.cpp
-+++ b/exempi/tests/utils.cpp
-@@ -34,6 +34,7 @@
-  * OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
-+#include <cstdio>
- 
- #include <boost/test/unit_test.hpp>
- 
-diff --git a/samples/source/XMPFilesCoverage.cpp b/samples/source/XMPFilesCoverage.cpp
-index dc9ce41..007c12b 100644
---- a/samples/source/XMPFilesCoverage.cpp
-+++ b/samples/source/XMPFilesCoverage.cpp
-@@ -17,6 +17,7 @@
- #include <errno.h>
- #include <time.h>
- #include <cstring>
-+#include <cstdio>
- 
- #define TXMP_STRING_TYPE std::string
- #define XMP_INCLUDE_XMPFILES 1
-diff --git a/source/common/XML_Node.cpp b/source/common/XML_Node.cpp
-index de3866f..75298a8 100644
---- a/source/common/XML_Node.cpp
-+++ b/source/common/XML_Node.cpp
-@@ -11,6 +11,7 @@
- 
- #include <string.h>
- #include <cstring>
-+#include <cstdio>
- #include <map>
- 
- // ! Can't include XMP..._Impl.hpp - used by both Core and Files.
--- 
-1.6.3
-
diff --git a/media-libs/exempi/metadata.xml b/media-libs/exempi/metadata.xml
index 4713f0f72261..9879e83b822e 100644
--- a/media-libs/exempi/metadata.xml
+++ b/media-libs/exempi/metadata.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<longdescription lang="en">
-Exempi is an implementation of XMP.
-</longdescription>
+  <herd>freedesktop</herd>
+  <maintainer>
+    <email>freedesktop-bugs@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>
-