convert from mozilla to seamonkey. remove old ebuilds.

(Portage version: 2.1.1_pre1-r5)

5 files changed, 140 insertions, 1 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index 912e5d44d377..b37244d2d674 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.114 2006/06/29 15:26:33 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.115 2006/07/02 20:23:42 allanonjl Exp $
+
+*yelp-2.14.2-r2 (02 Jul 2006)
+*yelp-2.12.2-r1 (02 Jul 2006)
+
+  02 Jul 2006; John N. Laliberte <allanonjl@gentoo.org> -yelp-2.6.5.ebuild,
+  -yelp-2.10.0.ebuild, +yelp-2.12.2-r1.ebuild, +yelp-2.14.2-r2.ebuild:
+  convert from mozilla to seamonkey.  remove old ebuilds.
 
   29 Jun 2006; Daniel Drake <dsd@gentoo.org>
   +files/yelp-2.14.2-ampersand-escaping.patch, yelp-2.10.0.ebuild,
diff --git a/gnome-extra/yelp/files/digest-yelp-2.12.2-r1 b/gnome-extra/yelp/files/digest-yelp-2.12.2-r1
new file mode 100644
index 000000000000..c0242bb970d0
--- /dev/null
+++ b/gnome-extra/yelp/files/digest-yelp-2.12.2-r1
@@ -0,0 +1,3 @@
+MD5 e229529aa1dacfd269024511e2c12ad2 yelp-2.12.2.tar.bz2 815933
+RMD160 9b4d551480af5179a1f6f3d8d842381cace3c5a1 yelp-2.12.2.tar.bz2 815933
+SHA256 ee56b279131f7d2c40da332eece9eee4a7fc4ec36425d29f201038f8a2f382c9 yelp-2.12.2.tar.bz2 815933
diff --git a/gnome-extra/yelp/files/digest-yelp-2.14.2-r2 b/gnome-extra/yelp/files/digest-yelp-2.14.2-r2
new file mode 100644
index 000000000000..1756a101fedc
--- /dev/null
+++ b/gnome-extra/yelp/files/digest-yelp-2.14.2-r2
@@ -0,0 +1,3 @@
+MD5 4294fe3b01824675bd8be9d7936dcaa7 yelp-2.14.2.tar.bz2 774551
+RMD160 6ac35c06dfcac5d49d39d4882ddf665f9489dc06 yelp-2.14.2.tar.bz2 774551
+SHA256 daeb77cea0c9e5bdd931fd10897edd08ef99d539292caf3501ae67c33e1829ef yelp-2.14.2.tar.bz2 774551
diff --git a/gnome-extra/yelp/yelp-2.12.2-r1.ebuild b/gnome-extra/yelp/yelp-2.12.2-r1.ebuild
new file mode 100644
index 000000000000..39286811ae1d
--- /dev/null
+++ b/gnome-extra/yelp/yelp-2.12.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.12.2-r1.ebuild,v 1.1 2006/07/02 20:23:42 allanonjl Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Help browser for GNOME"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86"
+IUSE="firefox"
+
+RDEPEND=">=dev-libs/glib-2
+	>=gnome-base/orbit-2.12.4
+	>=gnome-base/gconf-2
+	>=app-text/gnome-doc-utils-0.3.1
+	>=gnome-base/gnome-vfs-2
+	>=x11-libs/gtk+-2.5.3
+	>=gnome-base/libbonobo-1.108
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnome-2.0.2
+	>=gnome-base/libgnomeui-1.103
+	>=dev-libs/libxml2-2.6.5
+	>=dev-libs/libxslt-1.1.4
+	sparc? ( >=www-client/mozilla-firefox-1.0.2-r1 )
+	ia64? ( >=www-client/mozilla-firefox-1.0.2-r1 )
+	ppc64? ( www-client/seamonkey )
+	!sparc? ( !ia64? ( !firefox? ( www-client/seamonkey ) ) )
+	firefox? ( >=www-client/mozilla-firefox-1.0.2-r1 )
+	dev-libs/popt
+	sys-libs/zlib
+	app-arch/bzip2"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.28
+	>=dev-util/pkgconfig-0.9"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+
+pkg_setup() {
+	G2CONF="--enable-man --enable-info"
+
+	if use firefox || use sparc || use ia64; then
+		G2CONF="${G2CONF} --with-mozilla=firefox"
+	else
+		G2CONF="${G2CONF} --with-mozilla=seamonkey"
+	fi
+}
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	epatch ${FILESDIR}/${PN}-2.6.4-makedepfix.patch
+}
diff --git a/gnome-extra/yelp/yelp-2.14.2-r2.ebuild b/gnome-extra/yelp/yelp-2.14.2-r2.ebuild
new file mode 100644
index 000000000000..815df9cab609
--- /dev/null
+++ b/gnome-extra/yelp/yelp-2.14.2-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.14.2-r2.ebuild,v 1.1 2006/07/02 20:23:42 allanonjl Exp $
+
+inherit eutils gnome2 autotools
+
+DESCRIPTION="Help browser for GNOME"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="firefox"
+
+RDEPEND=">=dev-libs/glib-2
+	>=gnome-base/orbit-2.12.4
+	>=gnome-base/gconf-2
+	>=app-text/gnome-doc-utils-0.3.1
+	>=gnome-base/gnome-vfs-2
+	>=x11-libs/gtk+-2.5.3
+	>=gnome-base/libbonobo-1.108
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnome-2.0.2
+	>=gnome-base/libgnomeui-1.103
+	>=gnome-base/libgnomeprint-2.2
+	>=gnome-base/libgnomeprintui-2.2
+	>=dev-libs/libxml2-2.6.5
+	>=dev-libs/libxslt-1.1.4
+	>=x11-libs/startup-notification-0.8
+	sparc? ( >=www-client/mozilla-firefox-1.0.2-r1 )
+	ia64? ( >=www-client/mozilla-firefox-1.0.2-r1 )
+	ppc64? ( www-client/seamonkey )
+	!sparc? ( !ia64? ( !firefox? ( www-client/seamonkey ) ) )
+	firefox? ( >=www-client/mozilla-firefox-1.0.2-r1 )
+	dev-libs/popt
+	sys-libs/zlib
+	app-arch/bzip2"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.28
+	>=dev-util/pkgconfig-0.9"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+
+pkg_setup() {
+	G2CONF="${G2CONF} --enable-man --enable-info"
+
+	if use firefox || use sparc || use ia64; then
+		G2CONF="${G2CONF} --with-mozilla=firefox"
+	else
+		G2CONF="${G2CONF} --with-mozilla=seamonkey"
+	fi
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	epatch ${FILESDIR}/${PN}-2.14.0-mozilla-include-fix.patch
+
+	# Fixes bug #132527, already merged upstream into next 2.14 release
+	epatch ${FILESDIR}/${P}-ampersand-escaping.patch
+
+	mv aclocal.m4 old_macros.m4
+	AT_M4DIR="m4 ." eautoreconf
+}