Drop DEPRECATED flags, bug #387335 by Sven E; use vala:0.14 for libchamplain-0.10, bug #387347 by Travis Hansen. Remove old.

(Portage version: 2.1.10.27/cvs/Linux x86_64)

5 files changed, 24 insertions, 70 deletions

diff --git a/media-libs/libchamplain/ChangeLog b/media-libs/libchamplain/ChangeLog
index 20a92a359cde..bbe5107ee28e 100644
--- a/media-libs/libchamplain/ChangeLog
+++ b/media-libs/libchamplain/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libchamplain
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/ChangeLog,v 1.20 2011/09/19 20:56:06 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/ChangeLog,v 1.21 2011/10/17 16:15:32 pacho Exp $
+
+  17 Oct 2011; Pacho Ramos <pacho@gentoo.org> libchamplain-0.6.0.ebuild,
+  libchamplain-0.8.3.ebuild, -libchamplain-0.10.0.ebuild,
+  libchamplain-0.10.1.ebuild:
+  Drop DEPRECATED flags, bug #387335 by Sven E; use vala:0.14 for
+  libchamplain-0.10, bug #387347 by Travis Hansen. Remove old.
 
 *libchamplain-0.10.1 (19 Sep 2011)
 
diff --git a/media-libs/libchamplain/libchamplain-0.10.0.ebuild b/media-libs/libchamplain/libchamplain-0.10.0.ebuild
deleted file mode 100644
index 871a2c158c4d..000000000000
--- a/media-libs/libchamplain/libchamplain-0.10.0.ebuild
+++ /dev/null
@@ -1,64 +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/libchamplain/libchamplain-0.10.0.ebuild,v 1.3 2011/06/15 16:41:18 pacho Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit gnome2
-
-DESCRIPTION="Clutter based world map renderer"
-HOMEPAGE="http://blog.pierlux.com/projects/libchamplain/en/"
-
-LICENSE="LGPL-2"
-SLOT="0.10"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc +gtk +introspection vala"
-
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.16:2
-	>=x11-libs/cairo-1.4
-	>=media-libs/clutter-1.2:1.0[introspection?]
-	>=media-libs/memphis-0.2.1:0.2[introspection?]
-	>=net-libs/libsoup-gnome-2.4.1:2.4
-	dev-db/sqlite:3
-	gtk? (
-		>=x11-libs/gtk+-2.90:3[introspection?]
-		>=media-libs/clutter-gtk-0.90:1.0 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.3 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.9 )
-	vala? ( dev-lang/vala:0.12[vapigen] )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	# Vala demos are only built, so just disable them
-	G2CONF="${G2CONF}
-		--disable-maintainer-mode
-		--disable-static
-		--disable-maemo
-		--disable-vala-demos
-		--enable-memphis
-		VAPIGEN=$(type -p vapigen-0.12)
-		$(use_enable debug)
-		$(use_enable gtk)
-		$(use_enable introspection)
-		$(use_enable vala)"
-}
-
-src_prepare() {
-	# Fix documentation slotability
-	sed -e "s/^DOC_MODULE.*/DOC_MODULE = ${PN}-${SLOT}/" \
-		-i docs/reference/Makefile.{am,in} || die "sed (1) failed"
-	sed -e "s/^DOC_MODULE.*/DOC_MODULE = ${PN}-gtk-${SLOT}/" \
-		-i docs/reference-gtk/Makefile.{am,in} || die "sed (2) failed"
-	mv "${S}"/docs/reference/${PN}{,-${SLOT}}-docs.sgml || die "mv (1) failed"
-	mv "${S}"/docs/reference-gtk/${PN}-gtk{,-${SLOT}}-docs.sgml || die "mv (1) failed"
-
-	gnome2_src_prepare
-}
diff --git a/media-libs/libchamplain/libchamplain-0.10.1.ebuild b/media-libs/libchamplain/libchamplain-0.10.1.ebuild
index 5816930eef0f..ba10f4a23e1c 100644
--- a/media-libs/libchamplain/libchamplain-0.10.1.ebuild
+++ b/media-libs/libchamplain/libchamplain-0.10.1.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/libchamplain/libchamplain-0.10.1.ebuild,v 1.1 2011/09/19 20:56:06 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/libchamplain-0.10.1.ebuild,v 1.2 2011/10/17 16:15:32 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -33,7 +33,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( >=dev-util/gtk-doc-1.9 )
-	vala? ( dev-lang/vala:0.12[vapigen] )"
+	vala? ( dev-lang/vala:0.14[vapigen] )"
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS README"
@@ -44,7 +44,7 @@ pkg_setup() {
 		--disable-maemo
 		--disable-vala-demos
 		--enable-memphis
-		VAPIGEN=$(type -p vapigen-0.12)
+		VAPIGEN=$(type -p vapigen-0.14)
 		$(use_enable debug)
 		$(use_enable gtk)
 		$(use_enable introspection)
diff --git a/media-libs/libchamplain/libchamplain-0.6.0.ebuild b/media-libs/libchamplain/libchamplain-0.6.0.ebuild
index 8f7fa9be3935..473d7eb4e785 100644
--- a/media-libs/libchamplain/libchamplain-0.6.0.ebuild
+++ b/media-libs/libchamplain/libchamplain-0.6.0.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/libchamplain/libchamplain-0.6.0.ebuild,v 1.11 2011/06/15 08:43:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/libchamplain-0.6.0.ebuild,v 1.12 2011/10/17 16:15:32 pacho Exp $
 
 EAPI="3"
 
@@ -54,6 +54,10 @@ G2CONF="${G2CONF}
 src_prepare() {
 	gnome2_src_prepare
 	sed 's:bindings::g' -i Makefile.in || die
+
+	# Drop DEPRECATED flags, bug #387335
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
+		tidy/Makefile.am tidy/Makefile.in || die
 }
 
 src_compile() {
diff --git a/media-libs/libchamplain/libchamplain-0.8.3.ebuild b/media-libs/libchamplain/libchamplain-0.8.3.ebuild
index 0b1dcb5a28d6..ba6b80acfd65 100644
--- a/media-libs/libchamplain/libchamplain-0.8.3.ebuild
+++ b/media-libs/libchamplain/libchamplain-0.8.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/libchamplain/libchamplain-0.8.3.ebuild,v 1.5 2011/07/14 11:01:59 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/libchamplain-0.8.3.ebuild,v 1.6 2011/10/17 16:15:32 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -40,3 +40,11 @@ pkg_setup() {
 		$(use_enable gtk)
 		$(use_enable introspection)"
 }
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Drop DEPRECATED flags, bug #387335
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
+		tidy/Makefile.am tidy/Makefile.in || die
+}