Version bump, drop old

(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 68 insertions, 55 deletions

diff --git a/gnome-extra/gucharmap/ChangeLog b/gnome-extra/gucharmap/ChangeLog
index fa3ffde09629..4fcd04ee6025 100644
--- a/gnome-extra/gucharmap/ChangeLog
+++ b/gnome-extra/gucharmap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gucharmap
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/ChangeLog,v 1.203 2013/04/22 17:47:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/ChangeLog,v 1.204 2013/05/13 19:11:38 pacho Exp $
+
+*gucharmap-3.8.2 (13 May 2013)
+
+  13 May 2013; Pacho Ramos <pacho@gentoo.org> +gucharmap-3.8.2.ebuild,
+  -gucharmap-3.4.1.1.ebuild:
+  Version bump, drop old
 
 *gucharmap-3.8.1 (22 Apr 2013)
 
diff --git a/gnome-extra/gucharmap/gucharmap-3.4.1.1.ebuild b/gnome-extra/gucharmap/gucharmap-3.4.1.1.ebuild
deleted file mode 100644
index 2e85dc08b446..000000000000
--- a/gnome-extra/gucharmap/gucharmap-3.4.1.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-3.4.1.1.ebuild,v 1.9 2012/11/15 19:51:04 pacho Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://live.gnome.org/Gucharmap"
-
-LICENSE="GPL-3"
-SLOT="2.90"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="cjk doc +introspection test"
-
-COMMON_DEPEND=">=dev-libs/glib-2.25.3
-	>=x11-libs/pango-1.2.1[introspection?]
-	>=x11-libs/gtk+-3.0.0:3[introspection?]
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.0 )"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/gucharmap-3:0"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	>=app-text/gnome-doc-utils-0.9.0
-
-	sys-devel/gettext
-
-	doc? ( >=dev-util/gtk-doc-1.0 )
-	test? ( ~app-text/docbook-xml-dtd-4.1.2 )"
-
-src_prepare() {
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable introspection)
-		$(use_enable cjk unihan)"
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-	# prevent file collisions with slot 0
-	sed -e "s:GETTEXT_PACKAGE=gucharmap$:GETTEXT_PACKAGE=gucharmap-${SLOT}:" \
-		-i configure.ac configure || die "sed configure.ac configure failed"
-
-	epatch "${FILESDIR}/${P}-fix-doc.patch" # bug 436710, fixed in 3.6
-
-	gnome2_src_prepare
-
-	# avoid autoreconf
-	sed -e 's/-Wall //g' -i configure || die "sed failed"
-}
diff --git a/gnome-extra/gucharmap/gucharmap-3.8.2.ebuild b/gnome-extra/gucharmap/gucharmap-3.8.2.ebuild
new file mode 100644
index 000000000000..cfe58dc251c7
--- /dev/null
+++ b/gnome-extra/gucharmap/gucharmap-3.8.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-3.8.2.ebuild,v 1.1 2013/05/13 19:11:38 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+VALA_MIN_API_VERSION="0.16"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="Unicode character map viewer and library"
+HOMEPAGE="http://live.gnome.org/Gucharmap"
+
+LICENSE="GPL-3"
+SLOT="2.90"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="cjk +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/pango-1.2.1[introspection?]
+	>=x11-libs/gtk+-3.4.0:3[introspection?]
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-extra/gucharmap-3:0
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	>=dev-util/gtk-doc-am-1
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (	app-text/docbook-xml-dtd:4.1.2 )
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	# prevent file collisions with slot 0
+	sed -e "s:GETTEXT_PACKAGE=gucharmap$:GETTEXT_PACKAGE=gucharmap-${SLOT}:" \
+		-i configure.ac configure || die "sed configure.ac configure failed"
+
+	# avoid autoreconf
+	sed -e 's/-Wall //g' -i configure || die "sed failed"
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Do not add ITSTOOL=$(type -P true); yelp-tools is a true required
+	# dependency here for some LINGUAS.
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection) \
+		$(use_enable cjk unihan) \
+		$(use_enable vala)
+}