Remove masked for removal package

(Portage version: 2.1.12.13/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 5 insertions, 61 deletions

diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index 2d20c5c56e6b..3ac84ff3aeb5 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gtkhtml
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.280 2013/05/12 16:33:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.281 2013/07/21 07:27:16 pacho Exp $
+
+  21 Jul 2013; Pacho Ramos <pacho@gentoo.org>
+  -files/libgtkhtml-2.2.0-alpha.patch, -gtkhtml-2.11.1.ebuild:
+  Remove masked for removal package
 
 *gtkhtml-4.6.5 (12 May 2013)
 
diff --git a/gnome-extra/gtkhtml/files/libgtkhtml-2.2.0-alpha.patch b/gnome-extra/gtkhtml/files/libgtkhtml-2.2.0-alpha.patch
deleted file mode 100644
index 488c1b116f75..000000000000
--- a/gnome-extra/gtkhtml/files/libgtkhtml-2.2.0-alpha.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgtkhtml-2.2.0/libgtkhtml/layout/htmlboxtable.c.old	2003-01-06 11:06:15.000000000 -0500
-+++ libgtkhtml-2.2.0/libgtkhtml/layout/htmlboxtable.c	2003-02-24 18:17:59.000000000 -0500
-@@ -503,7 +503,7 @@
- 		for (i=0; i< table->cols; i++) {
- 			if (table->col_info[i].style_width.type == type) {
- 				/* Make the space added proportional against the max width of the column */
--				gint to_add = (gint)((float) table->col_info[i].max / (float) max_width * (float)tmp);
-+				gint to_add = max_width ? (gint)((float) table->col_info[i].max / (float) max_width * (float)tmp) : 0; // don't div by zero on alpha
- 				if (to_add == 0)
- 					to_add = 1;
- 				
diff --git a/gnome-extra/gtkhtml/gtkhtml-2.11.1.ebuild b/gnome-extra/gtkhtml/gtkhtml-2.11.1.ebuild
deleted file mode 100644
index 54bff56ecbbc..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-2.11.1.ebuild
+++ /dev/null
@@ -1,49 +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/gtkhtml/gtkhtml-2.11.1.ebuild,v 1.16 2012/12/17 11:58:19 tetromino Exp $
-
-EAPI="1"
-
-inherit eutils gnome2 versionator autotools
-
-MY_P="lib${P}"
-MY_PN="lib${PN}"
-MY_MAJ_PV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Lightweight HTML rendering/printing/editing engine"
-HOMEPAGE="http://projects.gnome.org/evolution/"
-SRC_URI="mirror://gnome/sources/${MY_PN}/${MY_MAJ_PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="accessibility test"
-
-# gnome-vfs is only needed to run testgtkhtml (1/3 tests)
-
-RDEPEND=">=x11-libs/gtk+-2.13.0:2
-	>=dev-libs/libxml2-2.4.16:2
-	test? ( >=gnome-base/gnome-vfs-2:2 )"
-DEPEND="${RDEPEND}
-	 virtual/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO docs/IDEAS"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable accessibility)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	if use alpha; then
-		epatch "${FILESDIR}/${MY_PN}-2.2.0-alpha.patch"
-	fi
-
-	if use x86-fbsd; then
-		# We need a full autoreconf on FreeBSD at least to fix libtool errors.
-		eautoreconf
-	fi
-}