[gentoo-commits] proj/gnome:master commit in: gnome-extra/gucharmap/

[Gilles Dartiguelongue]

commit:     cd21e6b6c8534ef12b78df38566e917009e0d485
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 28 22:47:40 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Oct 29 00:06:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=cd21e6b6

gnome-extra/gucharmap: add missing modifications

---
 gnome-extra/gucharmap/gucharmap-3.6.0.ebuild |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/gnome-extra/gucharmap/gucharmap-3.6.0.ebuild b/gnome-extra/gucharmap/gucharmap-3.6.0.ebuild
index b3cf939..fda72c3 100644
--- a/gnome-extra/gucharmap/gucharmap-3.6.0.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-3.6.0.ebuild
@@ -14,33 +14,33 @@ 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 doc +introspection test"
+IUSE="cjk +introspection test"
 
-COMMON_DEPEND=">=dev-libs/glib-2.32
+COMMON_DEPEND="
+	>=dev-libs/glib-2.32
 	>=x11-libs/pango-1.2.1[introspection?]
 	>=x11-libs/gtk+-3.4.0:3[introspection?]
 
-	introspection? ( >=dev-libs/gobject-introspection-0.9.0 )"
+	introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
+"
 RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/gucharmap-3:0"
+	!<gnome-extra/gucharmap-3:0
+"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	sys-devel/gettext
+	>=dev-util/gtk-doc-1
 	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	test? ( ~app-text/docbook-xml-dtd-4.1.2 )
+"
 
-	doc? ( >=dev-util/gtk-doc-1.0 )
-	test? ( ~app-text/docbook-xml-dtd-4.1.2 )"
-
-pkg_setup() {
+src_prepare() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
 	G2CONF="${G2CONF}
 		--disable-static
-		--disable-scrollkeeper
 		$(use_enable introspection)
 		$(use_enable cjk unihan)"
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-}
 
-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"