gnome 2.8 commit

7 files changed, 37 insertions, 75 deletions

diff --git a/gnome-extra/libgtkhtml/ChangeLog b/gnome-extra/libgtkhtml/ChangeLog
index e5db58ec51e6..243495009919 100644
--- a/gnome-extra/libgtkhtml/ChangeLog
+++ b/gnome-extra/libgtkhtml/ChangeLog
@@ -1,6 +1,12 @@
 # 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.93 2004/09/13 21:48:57 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/ChangeLog,v 1.94 2004/09/17 11:32:44 foser Exp $
+
+*libgtkhtml-3.2.1 (17 Sep 2004)
+
+  17 Sep 2004; foser <foser@gentoo.org> libgtkhtml-3.2.1.ebuild :
+  Gnome 2.8 release
+  Fix deps & LICENSE
 
 *libgtkhtml-3.2.0 (13 Sep 2004)
 
diff --git a/gnome-extra/libgtkhtml/Manifest b/gnome-extra/libgtkhtml/Manifest
index 6cefa76210b3..45d8e9afabdf 100644
--- a/gnome-extra/libgtkhtml/Manifest
+++ b/gnome-extra/libgtkhtml/Manifest
@@ -1,27 +1,29 @@
-MD5 899ef5375a2d7182583e12d7c743a3d2 ChangeLog 12045
-MD5 8acfa41ae70e02c74b94da8d51dcaee7 libgtkhtml-2.4.0.ebuild 838
-MD5 bc5fca32cbca890743487c8947e1679c libgtkhtml-2.4.1.ebuild 848
 MD5 8632089b6020f33a5591e71bbb838ffd libgtkhtml-2.6.0.ebuild 931
-MD5 703344ac47772366ce5195c232876732 libgtkhtml-2.6.1.ebuild 937
+MD5 dc519174dda25370b57bb7ad8f2eb2ae libgtkhtml-3.1.19.ebuild 1283
+MD5 bc5fca32cbca890743487c8947e1679c libgtkhtml-2.4.1.ebuild 848
+MD5 a34719c00644669069d45aa606c8e11f libgtkhtml-3.2.0.ebuild 1279
 MD5 30db95792c9b2d9af7cd6ce78aa4d282 libgtkhtml-2.6.2.ebuild 941
+MD5 136763f4b3b6f1be30a354ac58874cf7 libgtkhtml-3.1.20.ebuild 1283
 MD5 20ed67af410ecf7b8ed82c02c6189121 libgtkhtml-3.0.10-r1.ebuild 1495
-MD5 8a94d18c414ee8ea5cf3a36034d38345 libgtkhtml-3.0.10.ebuild 1357
-MD5 dc519174dda25370b57bb7ad8f2eb2ae libgtkhtml-3.1.19.ebuild 1283
+MD5 8acfa41ae70e02c74b94da8d51dcaee7 libgtkhtml-2.4.0.ebuild 838
+MD5 703344ac47772366ce5195c232876732 libgtkhtml-2.6.1.ebuild 937
+MD5 a34719c00644669069d45aa606c8e11f libgtkhtml-3.2.1.ebuild 1279
+MD5 899ef5375a2d7182583e12d7c743a3d2 ChangeLog 12045
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 136763f4b3b6f1be30a354ac58874cf7 libgtkhtml-3.1.20.ebuild 1283
-MD5 a34719c00644669069d45aa606c8e11f libgtkhtml-3.2.0.ebuild 1279
+MD5 8a94d18c414ee8ea5cf3a36034d38345 libgtkhtml-3.0.10.ebuild 1357
+MD5 c802878860f7a2692df330e54e635c0c files/libgtkhtml-3.0.7-libtool.patch 656
+MD5 91961ab08a6720382576581f1c879963 files/libgtkhtml-3.0.8-alpha.patch 700
+MD5 2e7135d7b2ce243b2df4b22e6f8531ce files/digest-libgtkhtml-3.0.10 68
+MD5 cfd5d77ce7f2907242bb4ed52e3cdb7f files/digest-libgtkhtml-3.1.19 68
+MD5 148bd01169f1f169f5c051e1428a8c23 files/digest-libgtkhtml-3.1.20 68
+MD5 8b985f9a98b7a90232d5ea193b8078d1 files/libgtkhtml-2.2.0-alpha.patch 652
+MD5 e34bf128bd5fd129fbc7ed28558c2d5b files/libgtkhtml-3.0.9-gtk-2.4.patch 3582
 MD5 c4945ff6d58733accdf9ff738ddc34b1 files/digest-libgtkhtml-2.4.0 69
 MD5 a5a0241e2812997e4266c6ba1df009ee files/digest-libgtkhtml-2.4.1 69
 MD5 1f2800f5de2c490d27d8befe0bf150e3 files/digest-libgtkhtml-2.6.0 69
 MD5 eb876ffb327ae10a0bdbc7efda2ca329 files/digest-libgtkhtml-2.6.1 69
 MD5 61ab3b67f222041451c0d1fa3f69df9d files/digest-libgtkhtml-2.6.2 69
-MD5 2e7135d7b2ce243b2df4b22e6f8531ce files/digest-libgtkhtml-3.0.10 68
-MD5 2e7135d7b2ce243b2df4b22e6f8531ce files/digest-libgtkhtml-3.0.10-r1 68
-MD5 cfd5d77ce7f2907242bb4ed52e3cdb7f files/digest-libgtkhtml-3.1.19 68
-MD5 8b985f9a98b7a90232d5ea193b8078d1 files/libgtkhtml-2.2.0-alpha.patch 652
-MD5 c802878860f7a2692df330e54e635c0c files/libgtkhtml-3.0.7-libtool.patch 656
-MD5 91961ab08a6720382576581f1c879963 files/libgtkhtml-3.0.8-alpha.patch 700
-MD5 e34bf128bd5fd129fbc7ed28558c2d5b files/libgtkhtml-3.0.9-gtk-2.4.patch 3582
-MD5 c3a4d4c5994a804fef9d7c8009d5bb67 files/libgtkhtml-fix_preedit.patch 2439
-MD5 148bd01169f1f169f5c051e1428a8c23 files/digest-libgtkhtml-3.1.20 68
 MD5 71eeeae5cc9c3fd0ff5c239a0cb6ad04 files/digest-libgtkhtml-3.2.0 67
+MD5 433f4f6faa51907dff64d98de0e28931 files/digest-libgtkhtml-3.2.1 67
+MD5 c3a4d4c5994a804fef9d7c8009d5bb67 files/libgtkhtml-fix_preedit.patch 2439
+MD5 2e7135d7b2ce243b2df4b22e6f8531ce files/digest-libgtkhtml-3.0.10-r1 68
diff --git a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.1.19 b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.1.19
deleted file mode 100644
index 3965604ef405..000000000000
--- a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.1.19
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7b842bd67f753c8e9272554a60c56ff2 gtkhtml-3.1.19.tar.bz2 1281653
diff --git a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.1.20 b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.1.20
deleted file mode 100644
index b487d6614e98..000000000000
--- a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.1.20
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7f69cf51f87e9e3a7f9131924f99c5ef gtkhtml-3.1.20.tar.bz2 1294413
diff --git a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.2.1 b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.2.1
new file mode 100644
index 000000000000..bd3127825cbd
--- /dev/null
+++ b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.2.1
@@ -0,0 +1 @@
+MD5 271bab24a21005537773402964e5550f gtkhtml-3.2.1.tar.bz2 1315940
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.1.19.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.1.19.ebuild
deleted file mode 100644
index 3af641a69edd..000000000000
--- a/gnome-extra/libgtkhtml/libgtkhtml-3.1.19.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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.1.19.ebuild,v 1.2 2004/08/21 15:05:32 foser Exp $
-
-inherit gnome2 eutils debug
-
-MY_P=${P/lib/}
-MY_PN=${PN/lib/}
-DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
-HOMEPAGE="http://www.gnome.org/"
-
-# stolen from gnome.org eclass because it support this one-off name-mangling
-
-[ -z "${GNOME_TARBALL_SUFFIX}" ] && export GNOME_TARBALL_SUFFIX="bz2"
-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.1"
-KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha ~ia64 ~amd64"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-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
-	>=x11-themes/gnome-icon-theme-1.2.3
-	>=gnome-base/libglade-2
-	>=gnome-base/libbonoboui-2.2.4
-	>=gnome-base/orbit-2.5.6
-	>=gnome-base/gnome-vfs-2.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"
-
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.1.20.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.2.1.ebuild
index cc2cef57345a..55a9f6af492d 100644
--- a/gnome-extra/libgtkhtml/libgtkhtml-3.1.20.ebuild
+++ b/gnome-extra/libgtkhtml/libgtkhtml-3.2.1.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.1.20.ebuild,v 1.1 2004/08/24 15:01:54 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.2.1.ebuild,v 1.1 2004/09/17 11:32:44 foser Exp $
 
-inherit gnome2 eutils debug
+inherit gnome2 eutils
 
 MY_P=${P/lib/}
 MY_PN=${PN/lib/}
@@ -11,28 +11,27 @@ HOMEPAGE="http://www.gnome.org/"
 
 # stolen from gnome.org eclass because it support this one-off name-mangling
 
-[ -z "${GNOME_TARBALL_SUFFIX}" ] && export GNOME_TARBALL_SUFFIX="bz2"
 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.1"
+SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="3.2"
 KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha ~ia64 ~amd64"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
 
 RDEPEND=">=gnome-extra/gal-2.1.14
-	>=net-libs/libsoup-2.1.13
+	>=net-libs/libsoup-2.2
+	>=x11-libs/gtk+-2.2
 	>=gnome-base/libgnomeui-2
 	>=gnome-base/libgnomeprint-2.2
 	>=gnome-base/libgnomeprintui-2.2.1
-	>=x11-themes/gnome-icon-theme-1.2.3
+	>=x11-themes/gnome-icon-theme-1.2
 	>=gnome-base/libglade-2
 	>=gnome-base/libbonoboui-2.2.4
-	>=gnome-base/orbit-2.5.6
-	>=gnome-base/gnome-vfs-2.1
 	>=gnome-base/gail-1
-	>=dev-libs/libxml2-2.5"
+	!=gnome-extra/libgtkhtml-3.1*"
 
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.30