Clean up old revision.

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key C6085806)

3 files changed, 14 insertions, 64 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index 5a626b13c853..6170d61111d7 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.301 2013/03/28 17:32:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.302 2013/03/29 22:56:20 eva Exp $
+
+  29 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org> -yelp-3.4.2.ebuild,
+  yelp-3.8.0.ebuild:
+  Clean up old revision.
 
 *yelp-3.8.0 (28 Mar 2013)
 
diff --git a/gnome-extra/yelp/yelp-3.4.2.ebuild b/gnome-extra/yelp/yelp-3.4.2.ebuild
deleted file mode 100644
index cddb33d8acb2..000000000000
--- a/gnome-extra/yelp/yelp-3.4.2.ebuild
+++ /dev/null
@@ -1,56 +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/yelp/yelp-3.4.2.ebuild,v 1.4 2012/12/19 02:12:52 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-# yelp-xsl-3.1.1 neded due to commit ee830ed9
-RDEPEND="
-	app-arch/bzip2
-	>=app-arch/xz-utils-4.9
-	dev-db/sqlite:3
-	>=dev-libs/glib-2.25.11:2
-	>=dev-libs/libxml2-2.6.5:2
-	>=dev-libs/libxslt-1.1.4
-	>=gnome-extra/yelp-xsl-3.3.2
-	>=net-libs/webkit-gtk-1.3.2:3
-	>=x11-libs/gtk+-2.91.8:3
-	x11-themes/gnome-icon-theme-symbolic"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.41.0
-	dev-util/itstool
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	gnome-base/gnome-common"
-# If eautoreconf:
-#	gnome-base/gnome-common
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-schemas-compile
-		--enable-bz2
-		--enable-lzma"
-
-	# Fix compatibility with Gentoo's sys-apps/man
-	# https://bugzilla.gnome.org/show_bug.cgi?id=648854
-	epatch "${FILESDIR}/${PN}-3.0.3-man-compatibility.patch"
-
-	eautoreconf
-
-	gnome2_src_prepare
-}
diff --git a/gnome-extra/yelp/yelp-3.8.0.ebuild b/gnome-extra/yelp/yelp-3.8.0.ebuild
index efae7449f18c..d920bfe30774 100644
--- a/gnome-extra/yelp/yelp-3.8.0.ebuild
+++ b/gnome-extra/yelp/yelp-3.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-3.8.0.ebuild,v 1.1 2013/03/28 17:32:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-3.8.0.ebuild,v 1.2 2013/03/29 22:56:20 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -36,12 +36,6 @@ DEPEND="${RDEPEND}
 #	gnome-base/gnome-common
 
 src_prepare() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--enable-bz2
-		--enable-lzma
-		ITSTOOL=$(type -P true)"
-
 	# Fix compatibility with Gentoo's sys-apps/man
 	# https://bugzilla.gnome.org/show_bug.cgi?id=648854
 	epatch "${FILESDIR}/${PN}-3.0.3-man-compatibility.patch"
@@ -50,3 +44,11 @@ src_prepare() {
 
 	gnome2_src_prepare
 }
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-bz2 \
+		--enable-lzma \
+		ITSTOOL=$(type -P true)
+}