Removed old, fix for conditional building vala bindings, 359549

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

5 files changed, 29 insertions, 55 deletions

diff --git a/media-libs/memphis/ChangeLog b/media-libs/memphis/ChangeLog
index b6e3a5ab0cf7..7bbfb2502333 100644
--- a/media-libs/memphis/ChangeLog
+++ b/media-libs/memphis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/memphis
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/memphis/ChangeLog,v 1.5 2011/03/07 12:17:43 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/memphis/ChangeLog,v 1.6 2011/03/20 09:46:49 jlec Exp $
+
+  20 Mar 2011; Justin Lecher <jlec@gentoo.org> -memphis-0.2.2.ebuild,
+  memphis-0.2.3.ebuild, +files/memphis-0.2.3-demos.patch:
+  Removed old, fix for conditional building vala bindings, 359549
 
   07 Mar 2011; Justin Lecher <jlec@gentoo.org> memphis-0.2.2.ebuild,
   memphis-0.2.3.ebuild:
diff --git a/media-libs/memphis/Manifest b/media-libs/memphis/Manifest
index 5367cb3ffbde..0e9f1a31ae69 100644
--- a/media-libs/memphis/Manifest
+++ b/media-libs/memphis/Manifest
@@ -1,16 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST memphis-0.2.2.tar.gz 458884 RMD160 5e184ed23b63c81b7d5336f489c3dce5cd0ee37a SHA1 6da63c5ebf1cc56c296f95216d2951f184e9532b SHA256 48c0b99a1fa0942fed631a9e89b11a12a666e782708b726c6f78c8fa669434af
+AUX memphis-0.2.3-demos.patch 405 RMD160 af121163c40d1a3bc23097f77718ed9eb44fcaa2 SHA1 dbe38e3461487f10f4466b773d32f7ef78a3a5df SHA256 38b09ebf9c3e23a5e4012364f585eeb954f3f22b8f80f6938b8540b6f35a94e9
 DIST memphis-0.2.3.tar.gz 459423 RMD160 df6685fa2854cf0bc8bf2d52f2403e0cf2752186 SHA1 a2f287ae7a28554833269f59de17d0054ad01ebf SHA256 c1cc050938ee34400197489bc9c110cc4c7c03c73780087b8cdd83a148b0e69b
-EBUILD memphis-0.2.2.ebuild 1062 RMD160 fc7cbb31693caf180b438662af6e0220bdd82b41 SHA1 2f3db41e7c2a1018d15f922a7967097104c69b20 SHA256 df23ef63c0a7c0b5390b71c6090e859427355147618473f261ca0a6e3edf511d
-EBUILD memphis-0.2.3.ebuild 997 RMD160 3134ec54de3b60c138ebacb20c886d2d4c81efd6 SHA1 c9f8669bd916dbc3055eae6b05049fa6696d8578 SHA256 a46bdd3a98642dd932b969c21ac0e392689b2036dd0ef2ac7502ad5021d03e06
-MISC ChangeLog 885 RMD160 c41a3dbdff07de4320631e4a7491fd400c3e9d9c SHA1 36d6c52e243aaeb627a720e2505dfab43f3b5e68 SHA256 e5e45a3e68dfba828862d57664cf0e53e0d8d6bab3d8a6f2143f465ae66bb5f8
+EBUILD memphis-0.2.3.ebuild 1029 RMD160 c76e73c6faee01e46cf7d5292bb2ec3d1a91e952 SHA1 0f9ecdb8fa2d7fb7ee55963f5270ce004287c088 SHA256 fb20d725d5567878d17aba49d5fc54e922be52d873ceb58e123c3b7ba428caeb
+MISC ChangeLog 1080 RMD160 3c89c002eef93291eac0b31b5d8c10142d0fecc5 SHA1 dc46cfd51218b97832c9222598b3ed33da3fae6d SHA256 0edfd3066c4e3a251e5dc9a10df9d496e2a8ac3d964210a83efcc921e0c944ef
 MISC metadata.xml 370 RMD160 4e11579187a9b141c26290943c692e8dcabc0917 SHA1 8173448f2aa6e21d44395558cb27118c8520d27e SHA256 bee71345dc10172f2a13cdc188f4bf6934dead3e82a40773574509b47c324230
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk10zPAACgkQgAnW8HDreRamMACeJk3Gf3d5ztAWkn/e6X9wQw4g
-PpAAn38lVmpRZc2x8AIW0NAguoAM6/Jr
-=YV7k
+iEYEARECAAYFAk2FzQ4ACgkQgAnW8HDreRZWegCgl+/DNfM4OTbZ08FHlOFiD0IW
+MHIAniyuV04Qzsj89MBa7ryvsULBbKKh
+=LiNF
 -----END PGP SIGNATURE-----
diff --git a/media-libs/memphis/files/memphis-0.2.3-demos.patch b/media-libs/memphis/files/memphis-0.2.3-demos.patch
new file mode 100644
index 000000000000..2d9510efdc5f
--- /dev/null
+++ b/media-libs/memphis/files/memphis-0.2.3-demos.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index d1a063d..68218b5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -95,7 +95,7 @@ if test x$enable_vala = xyes; then
+   AC_SUBST(VALA_EXAMPLE_PACKAGES)
+ fi
+ 
+-AM_CONDITIONAL(ENABLE_VALA, test x${VALAC} != x"")
++AM_CONDITIONAL(ENABLE_VALA, test x$enable_vala = xyes"")
+ 
+ # -----------------------------------------------------------
+ AC_CONFIG_FILES([Makefile
diff --git a/media-libs/memphis/memphis-0.2.2.ebuild b/media-libs/memphis/memphis-0.2.2.ebuild
deleted file mode 100644
index cf8bdc6cfe24..000000000000
--- a/media-libs/memphis/memphis-0.2.2.ebuild
+++ /dev/null
@@ -1,44 +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/memphis/memphis-0.2.2.ebuild,v 1.4 2011/03/07 12:17:43 jlec Exp $
-
-EAPI="3"
-
-WANT_AUTOMAKE=1.11
-
-inherit autotools base
-
-DESCRIPTION="A map-rendering application and a library for OpenStreetMap"
-HOMEPAGE="http://trac.openstreetmap.ch/trac/memphis"
-SRC_URI="http://wenner.ch/files/public/mirror/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0.2"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc introspection vala"
-
-RDEPEND="
-	>=dev-libs/expat-2.0.1
-	dev-libs/glib:2
-	>=x11-libs/cairo-1.8.8
-	introspection? ( dev-libs/gobject-introspection )
-	vala? ( dev-lang/vala:0.12 )"
-DEPEND="${RDEPEND}
-		doc? ( >=dev-util/gtk-doc-1.12 )"
-
-DOCS=(AUTHORS ChangeLog NEWS README)
-
-src_prepare() {
-	sed '/Werror/d' -i configure.ac
-	eautoreconf
-}
-
-src_configure() {
-	CFLAGS="${CFLAGS}" \
-	VALAC=$(type -p valac-0.12) \
-	econf \
-		$(use_enable debug) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
diff --git a/media-libs/memphis/memphis-0.2.3.ebuild b/media-libs/memphis/memphis-0.2.3.ebuild
index b21e028d69b5..a52c43cc519a 100644
--- a/media-libs/memphis/memphis-0.2.3.ebuild
+++ b/media-libs/memphis/memphis-0.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/memphis/memphis-0.2.3.ebuild,v 1.2 2011/03/07 12:17:43 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/memphis/memphis-0.2.3.ebuild,v 1.3 2011/03/20 09:46:49 jlec Exp $
 
 EAPI="3"
 
@@ -9,7 +9,7 @@ WANT_AUTOMAKE=1.11
 inherit autotools base
 
 DESCRIPTION="A map-rendering application and a library for OpenStreetMap"
-HOMEPAGE="http://trac.openstreetmap.ch/trac/memphis"
+HOMEPAGE="http://trac.openstreetmap.ch/trac/memphis/"
 SRC_URI="http://wenner.ch/files/public/mirror/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
@@ -29,8 +29,10 @@ DEPEND="${RDEPEND}
 DOCS=(AUTHORS ChangeLog NEWS README)
 
 src_configure() {
+	unset VALAC
+	use vala && export VALAC=$(type -p valac-0.12)
+
 	CFLAGS="${CFLAGS}" \
-	VALAC=$(type -p valac-0.12) \
 	econf \
 		$(use_enable debug) \
 		$(use_enable doc gtk-doc) \