evo-1.5 devel version libraries (#35456). removed libtool patch, libgtkhtml is now one library.

5 files changed, 23 insertions, 35 deletions

diff --git a/gnome-extra/libgtkhtml/ChangeLog b/gnome-extra/libgtkhtml/ChangeLog
index 84fc0f8dc353..58ebcb6a8d2f 100644
--- a/gnome-extra/libgtkhtml/ChangeLog
+++ b/gnome-extra/libgtkhtml/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/libgtkhtml
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/ChangeLog,v 1.86 2004/08/05 22:52:36 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/ChangeLog,v 1.87 2004/08/06 19:22:54 liquidx Exp $
+
+*libgtkhtml-3.1.19 (06 Aug 2004)
+
+  06 Aug 2004; Alastair Tse <liquidx@gentoo.org> libgtkhtml-3.0.10-r1.ebuild,
+  -libgtkhtml-3.0.9.ebuild, +libgtkhtml-3.1.19.ebuild:
+  evo-1.5 devel version libraries (#35456). removed libtool patch, libgtkhtml is
+  now one library.
 
   05 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> libgtkhtml-2.6.0.ebuild:
   Stable on sparc
diff --git a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.0.9 b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.0.9
deleted file mode 100644
index 21706552501a..000000000000
--- a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.0.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0fbbdcbc87ad5dcf33372320beb57283 gtkhtml-3.0.9.tar.bz2 1055368
diff --git a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.1.19 b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.1.19
new file mode 100644
index 000000000000..3965604ef405
--- /dev/null
+++ b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.1.19
@@ -0,0 +1 @@
+MD5 7b842bd67f753c8e9272554a60c56ff2 gtkhtml-3.1.19.tar.bz2 1281653
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.0.10-r1.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.0.10-r1.ebuild
index 348fd6c75a3d..31573ebf827d 100644
--- a/gnome-extra/libgtkhtml/libgtkhtml-3.0.10-r1.ebuild
+++ b/gnome-extra/libgtkhtml/libgtkhtml-3.0.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.0.10-r1.ebuild,v 1.3 2004/06/24 22:08:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.0.10-r1.ebuild,v 1.4 2004/08/06 19:22:54 liquidx Exp $
 
 inherit gnome2 eutils
 
@@ -16,7 +16,7 @@ PVP=($(echo " $PV " | sed 's:[-\._]: :g'))
 SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.${GNOME_TARBALL_SUFFIX}"
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha ~ia64 ~amd64"
+KEYWORDS="x86 ~ppc ~sparc ~hppa ~alpha ~ia64 ~amd64"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.0.9.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.1.19.ebuild
index afac8a2578f5..e99b5e128087 100644
--- a/gnome-extra/libgtkhtml/libgtkhtml-3.0.9.ebuild
+++ b/gnome-extra/libgtkhtml/libgtkhtml-3.1.19.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.0.9.ebuild,v 1.14 2004/06/24 22:08:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.1.19.ebuild,v 1.1 2004/08/06 19:22:54 liquidx Exp $
 
-inherit gnome2 eutils
+inherit gnome2 eutils debug
 
 MY_P=${P/lib/}
 MY_PN=${PN/lib/}
@@ -15,49 +15,30 @@ HOMEPAGE="http://www.gnome.org/"
 PVP=($(echo " $PV " | sed 's:[-\._]: :g'))
 SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.${GNOME_TARBALL_SUFFIX}"
 LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="x86 ppc sparc hppa alpha ia64 amd64"
+SLOT="3.1"
+KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha ~ia64 ~amd64"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
 
-RDEPEND=">=gnome-extra/gal-1.99.10
-	>=net-libs/libsoup-1.99.26
-	>=gnome-base/libgnomeui-2.2
+RDEPEND=">=gnome-extra/gal-2.1.13
+	>=net-libs/libsoup-2.1.12
+	>=gnome-base/libgnomeui-2
 	>=gnome-base/libgnomeprint-2.2
 	>=gnome-base/libgnomeprintui-2.2.1
-	>=gnome-base/libbonoboui-2.0
-	>=gnome-base/libbonobo-2.0
+	>=x11-themes/gnome-icon-theme-1.2.3
+	>=gnome-base/libglade-2
+	>=gnome-base/libbonoboui-2.2.4
 	>=gnome-base/ORBit2-2.5.6
 	>=gnome-base/gnome-vfs-2.1
-	>=gnome-base/gail-1.1
+	>=gnome-base/gail-1
 	>=dev-libs/libxml2-2.5"
 
 DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.30
 	>=dev-util/pkgconfig-0.12.0"
 
 USE_DESTDIR="1"
 SCROLLKEEPER_UPDATE="0"
 ELTCONF="--reverse-deps"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# The following patch fixes problems on 64-bit, but doesn't hurt
-	# to apply everywhere
-	epatch ${FILESDIR}/${PN}-3.0.8-alpha.patch
-
-	# fix gtk-2.4 build (#49218)
-	epatch ${FILESDIR}/${P}-gtk-2.4.patch
-
-}
-
-src_compile() {
-	gnome2_src_configure
-
-	EPATCH_OPTS="${S}/libtool"
-	epatch ${FILESDIR}/${PN}-3.0.7-libtool.patch
-
-	emake || die "make failed"
-}