Fix multiple QA bugs: bug 311599, 311601, 311605, 311607, 311609.

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

6 files changed, 27 insertions, 63 deletions

diff --git a/x11-libs/gtk+extra/ChangeLog b/x11-libs/gtk+extra/ChangeLog
index 68ebe5c567fa..98e11f530089 100644
--- a/x11-libs/gtk+extra/ChangeLog
+++ b/x11-libs/gtk+extra/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-libs/gtk+extra
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+extra/ChangeLog,v 1.22 2010/03/27 10:58:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+extra/ChangeLog,v 1.23 2010/03/27 11:54:54 pacho Exp $
+
+  27 Mar 2010; Pacho Ramos <pacho@gentoo.org>
+  -files/gtk+extra-2.1.1-fix-row-deletion-segfault.patch,
+  -files/gtk+extra-2.1.1-glib2.10-full-fix.patch,
+  -files/gtk+extra-2.1.1-glib2.10.patch, gtk+extra-2.1.2.ebuild:
+  Install documentation in proper place (bug 311599), don't install useless
+  INSTALL file (bug 311601), drop no longer used patches (bug 311605), use
+  SLOT deps for gtk+ and glib (bug 311607), stop inheritting no longer used
+  eutils.eclass (bug 311609), switch license from GPL-2 to LGPL-2. Thanks a
+  lot to Samuli Suominen for noticing all the problems.
 
 *gtk+extra-2.1.2 (27 Mar 2010)
 
diff --git a/x11-libs/gtk+extra/Manifest b/x11-libs/gtk+extra/Manifest
index cb1c9fe4a61d..f31e021ce3b1 100644
--- a/x11-libs/gtk+extra/Manifest
+++ b/x11-libs/gtk+extra/Manifest
@@ -1,17 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX gtk+extra-2.1.1-fix-row-deletion-segfault.patch 523 RMD160 15fefdff6aa61a76f9c24618be6ad8983eccb4bc SHA1 61d83ff86d540e492f77960bafd88d10d9aad980 SHA256 0495dc3d3692c422c91c297370e99de97cdba6326cacfcbbc93ea8acf8ae8261
-AUX gtk+extra-2.1.1-glib2.10-full-fix.patch 631 RMD160 325bc963e2bb1ce46d4a56911a6e0d756c2f7f2a SHA1 893e9d338c125375ff643057cd134f9b1bddceaa SHA256 a81388ef0379079fb3be32ebfd8c3e1dc529b847eb6264396f26632a45dba4f1
-AUX gtk+extra-2.1.1-glib2.10.patch 433 RMD160 c82be271daea458f6bc32c7714bcf30f2d756e37 SHA1 d6ae84aa168b3b525d5e4163c222afeffee79e57 SHA256 2c6100e0a4215d0602335cf42347c9cc35b8639fe22f7e458748c847872d87f4
 DIST gtk+extra-2.1.2.tar.gz 1274946 RMD160 e14bfc2a055fdef0d037b494018ca25047cc3c9e SHA1 1b6cccbf89a79c8fe551d77c84dbf21a82c69f07 SHA256 bfc9603e2023ea071f2661ecc29e52c94b1beed6b69deae45b466df7f5b2ce55
-EBUILD gtk+extra-2.1.2.ebuild 621 RMD160 9b46e567676a8d621ccadf86f0f1245c7cfda3b4 SHA1 a366466c0957d22af79b0de57bbf838a8beccdf9 SHA256 1f34bbd4fed3767a15d7c3c8d19610b8f9efd57da694987d05fb732cc171f839
-MISC ChangeLog 3316 RMD160 9b1ab08f554cabe220e58596598ba5c93c86baf1 SHA1 e97d6a5f940ad948e1cb7191a3d20db6db227cd2 SHA256 99211664972c722af09c86b757f8a1407e3c4db7321cef8f593e1ee42b6d2784
+EBUILD gtk+extra-2.1.2.ebuild 686 RMD160 b8cef251070ebbfc6cc4e977288bcb1c3a43e7b7 SHA1 8efac89c0fbd0cff9fc6844d189fc0cb9dc221f3 SHA256 883140871da7e6b7bfffee0cbbbf93c96c6004d81344f11134cad10fe49b6d86
+MISC ChangeLog 3895 RMD160 7229b12a66507f1c9166432dae2165ac8c4564fd SHA1 9147bfd93ad3412f66fea4c72686b07c019911c5 SHA256 3fbb4d8d6ffcecc677ee714be85bfc58fde3386251d652d934e336461693141b
 MISC metadata.xml 209 RMD160 d8d5450994c26467cca04e0007b1ef7d4676d9d8 SHA1 972c9d81f4e17ce38f86fe6600fb6b786c4014ec SHA256 d1a9b5333a198e7e949511b738c16eeadb97a3ae7342bb6680aff97721be235c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkut5MMACgkQCaWpQKGI+9Q3zgCdG/G1BLhfR+6OLgLdcsBlB5bf
-ZccAn2QjoWoo3t0lrVSgj/TCCZaQdqvm
-=08aK
+iEYEARECAAYFAkut8hYACgkQCaWpQKGI+9TDegCeMj1h3qwItDJjQihH/c+BnCiu
+WgoAn0P4nGgHLo/awACZYmOu3S6pzEqw
+=O1zJ
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+extra/files/gtk+extra-2.1.1-fix-row-deletion-segfault.patch b/x11-libs/gtk+extra/files/gtk+extra-2.1.1-fix-row-deletion-segfault.patch
deleted file mode 100644
index 04aaeb4f9d90..000000000000
--- a/x11-libs/gtk+extra/files/gtk+extra-2.1.1-fix-row-deletion-segfault.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur gtk+extra/gtkextra/gtksheet.c gtk+extra-2.1.1/gtkextra/gtksheet.c
---- gtk+extra/gtkextra/gtksheet.c	2008-02-01 01:04:09.000000000 +0100
-+++ gtk+extra-2.1.1/gtkextra/gtksheet.c	2008-02-01 01:08:52.000000000 +0100
-@@ -7956,11 +7956,10 @@
-     }
- 
-     tbl->maxallocrow-=MIN(nrows,tbl->maxallocrow-row+1);
--    tbl->maxallocrow = MIN(tbl->maxallocrow, tbl->maxrow);
--
-   }
- 
-   tbl->maxrow-=nrows;
-+  tbl->maxallocrow = MIN(tbl->maxallocrow, tbl->maxrow);
-   gtk_sheet_recalc_top_ypixels(tbl, 0);
-   return TRUE;
- } 
diff --git a/x11-libs/gtk+extra/files/gtk+extra-2.1.1-glib2.10-full-fix.patch b/x11-libs/gtk+extra/files/gtk+extra-2.1.1-glib2.10-full-fix.patch
deleted file mode 100644
index c4fbfce39d3c..000000000000
--- a/x11-libs/gtk+extra/files/gtk+extra-2.1.1-glib2.10-full-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- gtkextra/gtksheet.c.orig	2005-06-24 19:51:00.000000000 +0200
-+++ gtkextra/gtksheet.c	2007-10-19 15:13:42.000000000 +0200
-@@ -2738,7 +2738,7 @@
-   gdk_window_destroy (sheet->row_title_window);
- 
-   if (sheet->pixmap){
--    g_free (sheet->pixmap);
-+    g_object_unref (sheet->pixmap);
-     sheet->pixmap = NULL;
-   }
- 
-@@ -4149,7 +4149,7 @@
- 			   &pixmap_width, &pixmap_height);
-       if ((pixmap_width != width) || (pixmap_height != height))
- 	{
--          g_free(sheet->pixmap);
-+          g_object_unref(sheet->pixmap);
- 	  sheet->pixmap = gdk_pixmap_new (sheet->sheet_window,
- 					       width, height,
- 					       -1);
-
diff --git a/x11-libs/gtk+extra/files/gtk+extra-2.1.1-glib2.10.patch b/x11-libs/gtk+extra/files/gtk+extra-2.1.1-glib2.10.patch
deleted file mode 100644
index b605c0cf02fc..000000000000
--- a/x11-libs/gtk+extra/files/gtk+extra-2.1.1-glib2.10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtkextra/gtksheet.c.old	2006-09-25 11:04:06.000000000 -0500
-+++ gtkextra/gtksheet.c	2006-09-25 11:04:33.000000000 -0500
-@@ -4149,7 +4149,7 @@
- 			   &pixmap_width, &pixmap_height);
-       if ((pixmap_width != width) || (pixmap_height != height))
- 	{
--          g_free(sheet->pixmap);
-+          g_object_unref(sheet->pixmap);
- 	  sheet->pixmap = gdk_pixmap_new (sheet->sheet_window,
- 					       width, height,
- 					       -1);
diff --git a/x11-libs/gtk+extra/gtk+extra-2.1.2.ebuild b/x11-libs/gtk+extra/gtk+extra-2.1.2.ebuild
index 41df9058bb45..eacd0a35b168 100644
--- a/x11-libs/gtk+extra/gtk+extra-2.1.2.ebuild
+++ b/x11-libs/gtk+extra/gtk+extra-2.1.2.ebuild
@@ -1,23 +1,28 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+extra/gtk+extra-2.1.2.ebuild,v 1.1 2010/03/27 10:58:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+extra/gtk+extra-2.1.2.ebuild,v 1.2 2010/03/27 11:54:54 pacho Exp $
 
+EAPI="2"
 GCONF_DEBUG="no"
 
-inherit gnome2 eutils
+inherit gnome2
 
 DESCRIPTION="Useful Additional GTK+ widgets"
 HOMEPAGE="http://gtkextra.sourceforge.net"
 SRC_URI="mirror://sourceforge/gtkextra/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-RDEPEND=">=x11-libs/gtk+-2.0
-		>=dev-libs/glib-2.0"
+RDEPEND="x11-libs/gtk+:2
+	dev-libs/glib:2"
 DEPEND="${RDEPEND}
 		dev-util/pkgconfig"
 
-DOCS="AUTHORS ChangeLog INSTALL README"
+DOCS="AUTHORS ChangeLog README"
+
+pkg_setup() {
+	G2CONF="${G2CONF} --with-html-dir=/usr/share/doc/${PF}/html"
+}