new release 'n cleanup

8 files changed, 75 insertions, 257 deletions

diff --git a/net-www/galeon/ChangeLog b/net-www/galeon/ChangeLog
index e56b73d030e9..1133ddbd3b6d 100644
--- a/net-www/galeon/ChangeLog
+++ b/net-www/galeon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/galeon
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/ChangeLog,v 1.72 2003/12/17 10:24:17 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/ChangeLog,v 1.73 2003/12/20 17:59:19 foser Exp $
+
+*galeon-1.3.11a (20 Dec 2003)
+
+  20 Dec 2003; foser <foser@gentoo.org> galeon-1.3.11a.ebuild :
+  New release, requested in #36184, minor dep fixes
 
   17 Dec 2003; Lars Weiler <pylon@gentoo.org> galeon-1.3.10.ebuild:
   Stable on ppc. Tested with net-www/mozilla-1.4-r3.
diff --git a/net-www/galeon/Manifest b/net-www/galeon/Manifest
index f231e82da708..888c78d1ea12 100644
--- a/net-www/galeon/Manifest
+++ b/net-www/galeon/Manifest
@@ -1,14 +1,10 @@
-MD5 efc7f93d6d434b63396a368e1f663a95 galeon-1.2.10a.ebuild 3296
-MD5 6debf9a1120d61f5daac3d2078009116 galeon-1.2.11.ebuild 3403
 MD5 6ec6747e6679fac5954a78068f6604b7 galeon-1.3.10.ebuild 1682
-MD5 e135d53bff09aaaca1fdfec23cb7549a galeon-1.3.11a.ebuild 1688
-MD5 15aaa5f7d78fee8ade74a1b1e024f510 ChangeLog 10872
+MD5 a2be974dae0a448c88ff45405bec782b galeon-1.3.11a.ebuild 1702
+MD5 7b7dd09b0d642dd338cfa53a5d9822bd ChangeLog 11020
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 59ca1a1e92c8aca51986e7fe458bd0d9 galeon-1.2.12.ebuild 3571
-MD5 ac03f7ff1c8c933092c3ff11d59e998c files/digest-galeon-1.2.11 66
 MD5 436b77780200d51a954cfa3fc77e9e2d files/digest-galeon-1.2.12 66
 MD5 db8a0894d9e2b9bbd8ad10e2a10e0928 files/digest-galeon-1.3.10 67
-MD5 8a4f5575c0225821b55e84ba7e75ae05 files/digest-galeon-1.2.10a 67
 MD5 ae742c626affcc36e9763f8f56b81689 files/digest-galeon-1.3.11a 68
 MD5 f4cef0104387767ea14b057e4fcd0cdc files/galeon-1.3.10-gcc2_fixes.patch 1262
 MD5 c72506690307bdae2ceec562ac7fdbd9 files/galeon-1.2.7-google-UTF8.patch 1594
diff --git a/net-www/galeon/files/digest-galeon-1.2.10a b/net-www/galeon/files/digest-galeon-1.2.10a
deleted file mode 100644
index 8a4a8d1021f7..000000000000
--- a/net-www/galeon/files/digest-galeon-1.2.10a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 03765ca56b2c8dee1538e413a26f5fb6 galeon-1.2.10a.tar.gz 4114691
diff --git a/net-www/galeon/files/digest-galeon-1.2.11 b/net-www/galeon/files/digest-galeon-1.2.11
deleted file mode 100644
index 120230817fac..000000000000
--- a/net-www/galeon/files/digest-galeon-1.2.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a24ac42b93621bc4df9476daf3056956 galeon-1.2.11.tar.gz 4216345
diff --git a/net-www/galeon/files/digest-galeon-1.3.11a b/net-www/galeon/files/digest-galeon-1.3.11a
new file mode 100644
index 000000000000..7c5222c5145a
--- /dev/null
+++ b/net-www/galeon/files/digest-galeon-1.3.11a
@@ -0,0 +1 @@
+MD5 970ec350142d2e2d2c9b94bce7cf7ab7 galeon-1.3.11a.tar.bz2 3233068
diff --git a/net-www/galeon/galeon-1.2.10a.ebuild b/net-www/galeon/galeon-1.2.10a.ebuild
deleted file mode 100644
index 94f14952fd90..000000000000
--- a/net-www/galeon/galeon-1.2.10a.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/galeon-1.2.10a.ebuild,v 1.6 2003/10/21 15:27:05 mholzer Exp $
-
-IUSE="nls"
-
-inherit eutils libtool gnome.org
-
-REQ_MOZ_VER="1.3"
-
-S="${WORKDIR}/${P%%a}"
-DESCRIPTION="A GNOME Web browser based on gecko (mozilla's rendering engine)"
-SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz
-	 mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://galeon.sourceforge.net"
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc alpha ~sparc"
-SLOT="0"
-
-RDEPEND="=net-www/mozilla-${REQ_MOZ_VER}*
-	>=gnome-base/gnome-libs-1.4.1.4
-	<=gnome-base/libglade-0.99.0
-	=gnome-base/gnome-vfs-1.0*
-	=gnome-base/gconf-1.0*
-	>=gnome-base/oaf-0.6.10
-	>=dev-libs/libxml-1.8.17
-	>=media-libs/gdk-pixbuf-0.18.0
-	nls? ( sys-devel/gettext
-	>=dev-util/intltool-0.17 )"
-	# bonobo? ( >=gnome-base/bonobo-1.0.19-r1 )
-
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper"
-
-pkg_setup() {
-
-	if [ ! -f ${ROOT}/usr/lib/mozilla/components/libwidget_gtk.so ]
-	then
-		eerror
-		eerror "It seems that your Mozilla was not compiled against gtk+-1.2,"
-		eerror "but rather gtk+-2.0.  As Galeon does not support this setup yet,"
-		eerror "you will have to remerge Mozilla with gtk+-1.2 support.  This"
-		eerror "can be done by taking \"gtk2\" out of your USE flags:"
-		eerror
-		eerror " # USE="-gtk2" emerge mozilla "
-		eerror
-		die "Need Mozilla compiled with gtk+-1.2!!"
-	fi
-}
-
-src_unpack() {
-
-	unpack ${A}
-
-	# Add UTF8 support to the google smart bookmarks.  Note that
-	# it will probibly only work for a newly created bookmark ...
-	# <azarah@gentoo.org> (26 Dec 2002)
-	cd ${S}; epatch ${FILESDIR}/${PN}-1.2.7-google-UTF8.patch
-}
-
-src_compile() {
-
-	elibtoolize
-
-	local myconf=
-	local moz_ver="`pkg-config --modversion mozilla-xpcom | cut -d. -f1,2 2>/dev/null`"
-
-	[ -z "${moz_ver}" ] && moz_ver="${REQ_MOZ_VER}"
-
-	use nls || myconf="${myconf} --disable-nls"
-	# use bonobo && myconf="${myconf} --enable-gnome-file-selector"
-
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc \
-		--localstatedir=/var/lib \
-		--with-mozilla-libs=${MOZILLA_FIVE_HOME} \
-		--with-mozilla-includes=${MOZILLA_FIVE_HOME}/include \
-		--without-debug	--disable-werror \
-		--disable-applet \
-		--disable-werror \
-		--disable-install-schemas \
-		--enable-nautilus-view=no \
-		--with-mozilla-snapshot=${moz_ver} \
-		${myconf} || die
-
-	emake || make || die
-}
-
-src_install() {
-
-	# galeon-config-tool was rewritten for 1.2.0 and causes sandbox
-	# violations if gconfd is shut down...  The schemas seem to install
-	# fine without it (at least it seems like it... *sigh*)
-	#gconftool --shutdown
-
-	make prefix=${D}/usr \
-	     mandir=${D}/usr/share/man \
-	     sysconfdir=${D}/etc \
-	     localstatedir=${D}/var/lib \
-	     install || die
-
-	dodoc AUTHORS ChangeLog COPYING* FAQ NEWS README TODO THANKS
-}
-
-pkg_postinst() {
-
-	galeon-config-tool --fix-gconf-permissions
-	galeon-config-tool --pkg-install-schemas
-	scrollkeeper-update
-
-	if [ -z "`use gnome`" ]
-	then
-		einfo "Please make sure libglade was built with gnome support, or"
-		einfo "else galeon will not be able to start up."
-		einfo
-		einfo 'To do this, type: '
-		einfo 'USE="gnome" emerge libglade'
-	fi
-}
-
diff --git a/net-www/galeon/galeon-1.2.11.ebuild b/net-www/galeon/galeon-1.2.11.ebuild
deleted file mode 100644
index 20f74a7c0bc4..000000000000
--- a/net-www/galeon/galeon-1.2.11.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/galeon-1.2.11.ebuild,v 1.9 2003/10/21 15:27:05 mholzer Exp $
-
-IUSE="nls"
-
-inherit eutils libtool gnome.org
-
-DESCRIPTION="A GNOME Web browser based on gecko (mozilla's rendering engine)"
-SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz
-	 mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://galeon.sourceforge.net"
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc alpha ~sparc"
-SLOT="0"
-
-RDEPEND=">=net-www/mozilla-1.3
-	>=gnome-base/gnome-libs-1.4.1.4
-	<=gnome-base/libglade-0.99.0
-	=gnome-base/gnome-vfs-1.0*
-	=gnome-base/gconf-1.0*
-	>=gnome-base/oaf-0.6.10
-	>=dev-libs/libxml-1.8.17
-	>=media-libs/gdk-pixbuf-0.18.0
-	nls? ( sys-devel/gettext
-	>=dev-util/intltool-0.17 )"
-	# bonobo? ( >=gnome-base/bonobo-1.0.19-r1 )
-
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	dev-util/pkgconfig"
-
-pkg_setup() {
-
-	if [ ! -f ${ROOT}/usr/lib/mozilla/components/libwidget_gtk.so ]
-	then
-		eerror
-		eerror "It seems that your Mozilla was not compiled against gtk+-1.2,"
-		eerror "but rather gtk+-2.0.  As Galeon does not support this setup yet,"
-		eerror "you will have to remerge Mozilla with gtk+-1.2 support.  This"
-		eerror "can be done by taking \"gtk2\" out of your USE flags:"
-		eerror
-		eerror " # USE="-gtk2" emerge mozilla "
-		eerror
-		die "Need Mozilla compiled with gtk+-1.2!!"
-	fi
-}
-
-src_unpack() {
-
-	unpack ${A}
-
-	# Add UTF8 support to the google smart bookmarks.  Note that
-	# it will probibly only work for a newly created bookmark ...
-	# <azarah@gentoo.org> (26 Dec 2002)
-	cd ${S}; epatch ${FILESDIR}/${PN}-1.2.7-google-UTF8.patch
-}
-
-src_compile() {
-
-	elibtoolize
-
-	local myconf=
-	local moz_ver="`pkg-config --modversion mozilla-xpcom | cut -d. -f1,2 2>/dev/null`"
-
-	use nls || myconf="${myconf} --disable-nls"
-	# use bonobo && myconf="${myconf} --enable-gnome-file-selector"
-
-	# http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml or #gentoo-hardened/irc.freenode
-	has_version "sys-devel/hardened-gcc" && append-flags "-yet_exec"
-
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc \
-		--localstatedir=/var/lib \
-		--with-mozilla-libs=${MOZILLA_FIVE_HOME} \
-		--with-mozilla-includes=${MOZILLA_FIVE_HOME}/include \
-		--without-debug	--disable-werror \
-		--disable-applet \
-		--disable-werror \
-		--disable-install-schemas \
-		--enable-nautilus-view=no \
-		--with-mozilla-snapshot=${moz_ver} \
-		${myconf} || die
-
-	emake || make || die
-}
-
-src_install() {
-
-	# galeon-config-tool was rewritten for 1.2.0 and causes sandbox
-	# violations if gconfd is shut down...  The schemas seem to install
-	# fine without it (at least it seems like it... *sigh*)
-	#gconftool --shutdown
-
-	make prefix=${D}/usr \
-	     mandir=${D}/usr/share/man \
-	     sysconfdir=${D}/etc \
-	     localstatedir=${D}/var/lib \
-	     install || die
-
-	dodoc AUTHORS ChangeLog COPYING* FAQ NEWS README TODO THANKS
-	rm -rf ${D}/var/lib/scrollkeeper
-}
-
-pkg_postinst() {
-
-	galeon-config-tool --fix-gconf-permissions
-	galeon-config-tool --pkg-install-schemas
-	scrollkeeper-update
-
-	if [ -z "`use gnome`" ]
-	then
-		einfo "Please make sure libglade was built with gnome support, or"
-		einfo "else galeon will not be able to start up."
-		einfo
-		einfo 'To do this, type: '
-		einfo 'USE="gnome" emerge libglade'
-	fi
-}
-
diff --git a/net-www/galeon/galeon-1.3.11a.ebuild b/net-www/galeon/galeon-1.3.11a.ebuild
new file mode 100644
index 000000000000..a619131e1310
--- /dev/null
+++ b/net-www/galeon/galeon-1.3.11a.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/galeon-1.3.11a.ebuild,v 1.1 2003/12/20 17:59:19 foser Exp $
+
+inherit gnome2 debug libtool
+
+DESCRIPTION="A GNOME Web browser based on gecko (mozilla's rendering engine)"
+HOMEPAGE="http://galeon.sourceforge.net"
+SRC_URI="mirror://sourceforge/galeon/${P}.tar.bz2"
+RESTRICT="nomirror"
+
+IUSE=""
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~ia64 ~amd64"
+SLOT="0"
+
+# supports moz-1.4 to 1.6b according NEWS
+RDEPEND="virtual/x11
+	>=net-www/mozilla-1.4
+	>=dev-libs/glib-2
+	>=x11-libs/gtk+-2
+	>=dev-libs/libxml2-2.4
+	>=gnome-base/gconf-2
+	>=gnome-base/ORBit2-2
+	>=gnome-base/libbonobo-2
+	>=gnome-base/libbonoboui-2.1.1
+	>=gnome-base/libgnomeui-2.0.5
+	>=gnome-base/gnome-vfs-2
+	>=gnome-base/libglade-2
+	app-text/scrollkeeper"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool
+	>=sys-devel/gettext-0.11"
+
+#src_unpack() {
+#	unpack ${A}
+#	cd ${S}
+
+#	epatch ${FILESDIR}/${PN}-1.3.10-gcc2_fixes.patch
+#}
+
+pkg_setup () {
+	if [ ! -f ${ROOT}/usr/lib/mozilla/components/libwidget_gtk2.so ]
+	then
+		eerror "you need mozilla-1.3+ compiled against gtk+-2"
+		eerror "export USE=\"gtk2\" ;emerge mozilla -p "
+		die "Need Mozilla compiled with gtk+-2.0!!"
+	fi
+}
+
+src_compile() {
+
+	elibtoolize
+	local moz_ver="`pkg-config --modversion mozilla-xpcom | cut -d. -f1,2 2>/dev/null`"
+	local myconf="--disable-werror"
+
+	myconf="${myconf} --with-mozilla-snapshot=${moz_ver}"
+
+	econf ${myconf} || die "configure failed"
+	make || die "compile failed"
+
+}
+
+DOCS="AUTHORS COPYING COPYING.README ChangeLog FAQ INSTALL README README.ExtraPrefs THANKS TODO NEWS"