Fix linking failure with gold (bug #384533, thanks to Naohiro Aota). Drop useless USE=doc, it only regenerated documentation. Update license. Drop old.

Package-Manager: portage-2.2.0_alpha137/cvs/Linux x86_64

9 files changed, 81 insertions, 363 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index 0be14386c84a..5c3d136db04f 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gnome-panel
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.355 2012/08/09 09:15:00 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.356 2012/10/16 03:47:52 tetromino Exp $
+
+  16 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-panel-2.32.1-r1.ebuild, -gnome-panel-2.32.1-r2.ebuild,
+  gnome-panel-2.32.1-r3.ebuild, +files/gnome-panel-2.32.1-underlinking.patch,
+  gnome-panel-3.2.1.ebuild, -gnome-panel-3.4.1.ebuild,
+  gnome-panel-3.4.2.1.ebuild:
+  Fix linking failure with gold (bug #384533, thanks to Naohiro Aota). Drop
+  useless USE=doc, it only regenerated documentation. Update license. Drop old.
 
 *gnome-panel-3.4.2.1 (09 Aug 2012)
 
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index be686230973f..86dc76ac1018 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -5,30 +5,27 @@ AUX gnome-panel-2.32.1-as-needed.patch 1030 SHA256 c311d13448ced0c74470f9c655fda
 AUX gnome-panel-2.32.1-evo-month.patch 810 SHA256 1b2854b64df8b628654a91b563b3846914a8ba7c9f2f5bf9f890e5a9a18f9238 SHA512 d4eb7a984d1655d569e3842c0494484764c061e062498f50d1c81899bb44fdf26be268e2b4a42ce4b7d3a44560a821d080396bb24a3ac85a0df4762ae95c8de3 WHIRLPOOL 2f40fb0f3a2d7179b9baf3aafc5eeaf0fe8515799c562ec2647a0893126bce87cd9b5e5381db94a17e00bf36a1be9109f555d841abd76e2be848d9e1e024bf65
 AUX gnome-panel-2.32.1-fix-multiscreen.patch 7513 SHA256 5bdb4fe08e79bc504b29aa4752bfb563b26870571f419cef447ebfe8c639dcb2 SHA512 07e26dea9d8225a855b64b1881cdc52351f8d3b03a7b4340e30a04965de10969436041778d7dfff21e2b455069061f3607a384015010828926f75f42b2a3d3ed WHIRLPOOL 1057b07b5029604aee734f8c42b8072fb739d0bef37eb15a8f3787750f22cff33117bf69c6e5b1b4118a1ff438c5228a3e2f55c505a49e3a9b633e707d8dd6fd
 AUX gnome-panel-2.32.1-fix-multiscreen2.patch 1451 SHA256 fd9cf2e5a0374fc8d68f9f30117d5c502e510eb8eb11fcea021594f7549bca89 SHA512 009b3cf49620338e986947848ca6e7fc12605fcc408453fadb9966c0aefea5d8aa7b57b4905d23c411a025684914cc3f3656c5f39ff64a7139d5a3c1c65f799e WHIRLPOOL 653ad151dfc84663debaf65be115ccf3d9cfb0d946675269660cb2b9d305d314248c8622cca9bd2e10250783d232b3ab7e995cca647a85a67bc4b41058fdf1e1
+AUX gnome-panel-2.32.1-underlinking.patch 1112 SHA256 b18a71e2f00bd8d991760fef0bf8ce189127cd24edb0ebdb455ed79adb30344c SHA512 d2c5120e6fad978b495f14a8983962ffb3ab5b74837d2456e642160cdeaf0ba0fbc02e04bd815858f618ce1b0d9cfa4e52d2abddc98f510015eeb64b040c389c WHIRLPOOL fb58bab08c1e7e3cef09857b3d22db720ca914e355f2da677bbc42fde5821cff8c8052c9072312d0145cf572528991c3a111fdf62aabfcefaba95bd3fa1d84bf
 AUX gnome-panel-3.2.1-gold.patch 6508 SHA256 19b867d126d12c5e26da141b6f21433dbf82f28e5aa1f172f157b4eb2a677da4 SHA512 8b7179a8651f9176e0312962859f88919f6b4e52a6611e5427c9f3788f8e5009109f507e1e500ae4b2a1096cd5e1bab89d4f98553a9eec949f734e6c35604db1 WHIRLPOOL c663147717c1fd1347c5db3557f2fe803b5a179cb2a6cd885e1506de9fee058412041fefd0162abfec016b11e806c26b5307862da4db1ba66cca59e27a9900f4
 AUX gnome-panel-3.4.2.1-gold.patch 1542 SHA256 cee57eeb17de297d42f8cc66e9794ca8ebf263c0365038835f432c09cfa653ae SHA512 469782d17e103e59afde5151e9af9d61890ac426f36bb1d0cb1d6576c59a49e34ba38803c4b82c67c881f719e84983af4c7bc1bc9055a0aad94271ebdc4fc669 WHIRLPOOL 5235ccb1cfce3be346917e51f75e663397713a1e29f7445eca5655b68b65df33f789c371baca4f646da16e11c5aefb6db2b9525ed21fcc2e117a02700b58b081
 DIST gnome-panel-2.32.1-patches.tar.bz2 6686 SHA256 b0e2f59e370a2a7da2cd5fd1513cc50cf2bf210fac765e05603d81f91e7bbcea SHA512 a9bf6765bddf535849a4983052451eb90a66131826923196dc0d7eda1ceb3a36510901da067ccf970dcac92b0cb4fce57fd1fe42594ada5e4b6c294c2128cf13 WHIRLPOOL c7c953d709402c6b505d87993fd446b63560e86218a767a0eae9348e6a25ba295be97232e9063de473611f3ccaf2ff0989f0974c9a753ff9092d8cda61ef95bf
 DIST gnome-panel-2.32.1.tar.bz2 3132156 SHA256 8f7828eb7a21c817a73b697844a4e20256059b32386414a10f97d51e7d9fca5f SHA512 ceae445cb64db89143b1d5aab46d5cd5e4b4c3333e67c03a54238bb55b396532a159bf13291f617c831664a699a6a323c69c471b534abf54ac697eb9923ef2e0 WHIRLPOOL 2da45235269373a37e722b3bdb92e5b946ed2cd0eb441702eb3ba804c362b5cc4b566ff9d4a012d52c0986badd6f2d0f1aa3c8bb7e50c7d8f2b7dbe7bf59fee3
 DIST gnome-panel-3.2.1.tar.xz 2424632 SHA256 ae5ed578f9f54ad763bf5e46fd5431cdbc06fa2eefea03b390c90a3ffb18870d SHA512 11af8d824f3ffa4268ffc7919244af6181db57f37069f8f0ea8a378dfb89a2626dd1aaea755f74889b2d8446d64de6873dfba326275e2ca8632546354e9d7cdb WHIRLPOOL 0a399a32c6d39919f7b62d175404c4f242f0e4eeb3c44c43738c44d98eacb92c90b1816af8a74ee24c56574824d85ab446943802ca01c2a149dc1c763f57374d
-DIST gnome-panel-3.4.1.tar.xz 2527068 SHA256 513be6e709db88babac9f3ce9e517cb597d8c89569e5c9aaa957b74e0765a77f SHA512 793e28fb0582e34adfda90ae1621a734668ed435e30cd0904e9756fae5d5a8814626a2e8e3d888957e70becc2a1b4e5e5493f46cb927f30aac7c4f608e198e27 WHIRLPOOL 4bae9511bcb0a61a770a4cad5c32a584a00ec181662065458770a9942c70df131a9486a2f3083bd36e9b254c433589295ed7bea7048cd68c7ca5994fea4fadd4
 DIST gnome-panel-3.4.2.1.tar.xz 2531232 SHA256 188ea2b93e4c8116e187abac3ecf590429ff8366ef4b610fab438bd338d857d2 SHA512 e52afd1a3c92a57f9e78f11aa0fd0322c44ea207fb47cba77d62e1e180a4274d902f772169a2fee0872e2cb2452f3857325e0327d00b81aec7ec49e7b5840634 WHIRLPOOL d92ba22fb1834c6e158b7e87d3004bac9325dcd0877272f27ad01911971f04b5f4022b7ba67a9d1db89d90dc50247ceda285141879117e81b27cc38bd6408f43
 DIST introspection-20110205.m4.tar.bz2 1220 SHA256 4394a606d380ae5315872ede35387f104da5fad96794d29c45c444a9d481d8b2 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be WHIRLPOOL 0765c0a72919b26d0c8c38714450eec578a347bfc1c59d4950b633b64b17aa1cde38dfb87fdcd6e2f364c98d6c0bd3dadaa9c2a9711bd1b5ac09a583b988f500
-EBUILD gnome-panel-2.32.1-r1.ebuild 3575 SHA256 3f8888b2c055c1ea6b0dc5a3f6eec2c50e2aae5b85c34b75fe6a6d670f8e69b7 SHA512 41cadd32280b0c46f13079b7bfe0d63e502fafdda917201c26cc1321644cb2d75b55ff199c47939ddc4cb160f05f90e7671968623b822741af7b6b35223d1ffd WHIRLPOOL 0e233fd90dec1b08bac1468453cd40856c5fe772dab1e1775344efe3127e70c02a91eef2c0583fefb96cc964f7474c0fcffd328843f250247d2d6ef96619c12b
-EBUILD gnome-panel-2.32.1-r2.ebuild 3597 SHA256 a15c266dc9b47fc8dd218f9a1c4a80b4e292438b9d1950430bedfde76c782ae4 SHA512 c3168b7f20be7f0059c0b7bbbd80de1ffd51fea33fd6ca754440f53419bd825674c7f5a1955a104b8eea4cb8a4825f8e0c6ce45ed85dcfe74f3088056ed9a541 WHIRLPOOL 459633044092b513018afdff643524b964de3fc3447413e48c3ed178941f7cd88b7509c1a7e1459ab4e10ff8cba3b3d3527272ca522a6aadbccdcb02faf0d121
-EBUILD gnome-panel-2.32.1-r3.ebuild 3653 SHA256 58208d520fbf87d9fd97dc09d15f98bdc0ca3b756f1593b26416913933dee64c SHA512 29354af21c235dbdd97d534c422678413cd6de1a25e155c10f95dbc22a4db143d1a4af350277699884caf0a96b889f307326f880d765cd0d82c37b349f3fc53a WHIRLPOOL a92c9fa658db3e0d9f3f2a574e4a5d01d590de9d5eed26b631feb29ac5e38afe9fb2c6436d3063a866289cb877de75b744e408f085d10869219dc5250e45f2f9
-EBUILD gnome-panel-3.2.1.ebuild 2713 SHA256 cde24d89c7a812cbdcac27e1c689d38cb4112733b5c8d1c44659ca20dc176148 SHA512 b4c4429500bd4599104125c4be4c14366636a299ca5387e05afe7e9628092002f6eccf32902b18ede9a27e96dda2837ca7cbc45b25a0d627752ce31df9daf7c4 WHIRLPOOL 3c21cfc8fbe68dbaf98ba49ca93c0b12829bd7a7285f08babb68435334fe43ef7e5c4c08fe4041c499fc0e65251e665684785fb66ab8de2f07ca5572503db8cd
-EBUILD gnome-panel-3.4.1.ebuild 2668 SHA256 24b3653650a9c7952555aa9ec37fde7b897c4e22b00f19da1b9ebab93eb1a565 SHA512 64b574a43f1eb373acdd504979282f32c01f75d9e981d9bf2cb2361ce8a8671db9975a560a12282633d25883d94a38baf08e6307d0d0910d97297c6c7d45a31d WHIRLPOOL bf1356fa3fd0f81aca338f929a811424cca637fa1fa349f7a3e31198393b4798ba198c6a6f9b507703c931d2ca652337e0e9df1b63fd0a64a403ab7314b47f89
-EBUILD gnome-panel-3.4.2.1.ebuild 2903 SHA256 9715724fd0bebd8be3c7ecceb750928a94ada672f9859dad958883698cfc39bc SHA512 88a4af962ff3c8afca9438ad070b31eb3e02021e5c0d9b3de57394973818fe2da7a45a324e7027ba599d50ea24c2bc5dde3c14d185b802ea5f70dbc3f4d0b5f6 WHIRLPOOL 91532dd29cacedf8786c29fa87dac9227c22bb7b19ccc97fea8f68ee171cbe4eafaab494490ade4582117cb6f853d1b32d2cbe8f421439a47e74806ebd479f17
-MISC ChangeLog 50474 SHA256 e98ea6f66cbb65b73e6cd67f71edcc76728f1a4fc65e4644db333b53f9617126 SHA512 97384289b4bb76156f8521259a3d084d4c910c5c596dd8f58cb4dd5076d232d9484dff94c4a39abecadbab400be7b58d08932310491191161dfcbea50124e9f0 WHIRLPOOL eda47143ab359d0e8125e5a759c2b053a7b939a90af1d2c3bc32c286a9ea6d9fae96453091bef5937bc7bf1421ca77c563db3fa9bebecccda76e699fc62e4aeb
+EBUILD gnome-panel-2.32.1-r3.ebuild 3614 SHA256 2d419a3dc389358a958546cb950c9db4de3dd5d041e07ba3a6caccee40e27803 SHA512 252b97b406d498680938056e9565578a6b5868b3ed933b50b991dd84a03da0512dc990b4bc57d9ca9f90ab95466388361ff700ae056a940f02631624578d8d65 WHIRLPOOL eae042d75b504d443fc7d99cd80eb393b0cb81612d3f0105c9f709d8118ccece8d2bcac4acdc8ad902a4e791668a5419c584b342fefa6a8bed01dfdfa727c405
+EBUILD gnome-panel-3.2.1.ebuild 2684 SHA256 e3a0e02c4ded82af0ee12d03a747e5fccbd51d23621675add7d6106d98d59de1 SHA512 95c9ad8233a68f1a622b6d74da1ce81e36cff71d0cc0b0c449859fbfeb4fa9c4c48c7599d23e45e9fa82d6902f23da9cf459c23af642f9768d496d837a2a0e12 WHIRLPOOL b4f6df298b9e0cc0d803e246f0fc1f37b550536348c45b4ed451c80a9aea01f5e3ddede37f8c9960af28fab76a928e721160d71a6d3f2780c8127d7098cb1ee4
+EBUILD gnome-panel-3.4.2.1.ebuild 2849 SHA256 08a09037f350e9dba2295a8c08ced41a6a8df75a8c9fddd79d25448f3fd6d549 SHA512 b9b15512a88ddacd7f58ae81759409e0abd5cfc6901cfc4d668c774210c68eafe3656e171859aa59addd149c902634544f7653796c38e67a4dd6c526143e781c WHIRLPOOL b22d14a4ac71e9d1935cc9f3e6e3704320f4af4d1c3bcebdb32fd4eea700dafd77211952455cfd49b46073c1d23ce58e8a114a9dd0058cf77b51f6bea4a273bd
+MISC ChangeLog 50917 SHA256 72b160ec92d304d71a65b860ec1d6b0f061cc365640547d09c3bba0b42df0e74 SHA512 c261ba70d849c765a2830e7574495d65faed3875e63b2cd208c0a820bff08f2ec1265e8482c2343f7e43be9ebd76f45958407cd5bb7f2884f8eedda2b4a63491 WHIRLPOOL bf00aa4ee1e9cf22d48a054346d6b46d1af33fd85d9103cecbc2c97be3dcb4f7d9abfcbcd59552cea84698cc9f3762a174b8a0906c1658faca21147fcfd9e5ab
 MISC metadata.xml 374 SHA256 69c9f86e95c7553d0ff7f84838cde89d1537206aa0de8869ee6a1aeec3cde403 SHA512 406475c057377f15e7f8ecd4c83f1d9aa067b9eebed1d01604bb6d4fd439ed0b22582797d242e076801ee835901f40fa39cb053481f1d75244ff4209a34e2401 WHIRLPOOL 2e697c4f81f4f47a4473681cb82c3fec1ee17f1d7170bede5af802bcf5363a5c541c0f869eabd0c0331c97ee7e5dfa7faaf62179f1d11ef301493343efbf687c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQI3+ZAAoJEJ0WA1zPCt1haL0H/idjQirjjHHrkpuWGN+xUq7o
-VngOX3XF23QLk77UhLnUywprLfCDAQBKYxOKsEG+n9m2A4lpY7ROOexeem8Fk3YG
-dnv/ptoEjdzf3EVjtUOTTXiaxg0Gidji+Q6IXB2EH5z7vAR+hUqPBwzu934B2xqR
-RA6UZ0TXgvIMkQz5NA8YHRl/PV3nOsRgNxLkWbV3thhuE3oif3wzNNUkZdxuPkOg
-xva4qm0Oxoeea2lqSy+rNgL1N6oT8g7WHnw71vVa1jBLrIaTxLXkL2B1nDN3tcQ1
-UmLAff3MwY6aPVMinOxzNvUb1gxQCcWPlYTbIvVyQjfLIbj5XVQ5J9tsmx2/GHo=
-=3Hs7
+iQEcBAEBCAAGBQJQfNjpAAoJEJ0WA1zPCt1hUMoH/iIF6i6we0wuG+NyWDrRCTsD
+qWEKRmRBsWZ9VbK+D0xa9aLpZJ69XejoFT6P5/3lMkcHO+/g2jZlWkUgzcXcwkx0
+foLCZUkGTQkNsQe7vYt9HmjYpqLwYTnDncelUbcgSkekhiYEgEefN6P0wOstkBHv
+6gW7sJt8bcozssBF9+BxvNjnktLaOuP1mLpej1BWE29Ox+RhgXH2rJddvnGZR1dY
+H7a1YUahhbngnuDl5DnKUKRhGHsImkRwZp3kQO6rbpXIrIqKS7CMR059gkHuNKuj
+sbynx81BA01yNUocNnSWxqhyOfYHvPOSAXBIRoOWp8YjURpQRHiEEY08HPCh0Uo=
+=n6x1
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.32.1-underlinking.patch b/gnome-base/gnome-panel/files/gnome-panel-2.32.1-underlinking.patch
new file mode 100644
index 000000000000..008600344c84
--- /dev/null
+++ b/gnome-base/gnome-panel/files/gnome-panel-2.32.1-underlinking.patch
@@ -0,0 +1,42 @@
+From cd9bd4858f82fc6830c01aa8168bfafab6b6b868 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 15 Oct 2012 23:21:06 -0400
+Subject: [PATCH] build: fix underlinking
+
+https://bugs.gentoo.org/show_bug.cgi?id=384533
+---
+ configure.ac            | 3 +++
+ gnome-panel/Makefile.am | 3 ++-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3f8c214..da37bd9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -31,6 +31,9 @@ AC_PROG_LIBTOOL
+ #AC_PROG_SED available in 2.59b
+ AM_PROG_CC_C_O
+ 
++AC_CHECK_LIBM
++AC_SUBST(LIBM)
++
+ AM_PATH_PYTHON
+ AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+ AC_PATH_PROG(GCONFTOOL, gconftool-2)
+diff --git a/gnome-panel/Makefile.am b/gnome-panel/Makefile.am
+index a341333..59c5dae 100644
+--- a/gnome-panel/Makefile.am
++++ b/gnome-panel/Makefile.am
+@@ -134,7 +134,8 @@ gnome_panel_LDADD =		\
+ 	$(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la			\
+ 	$(PANEL_LIBS)									\
+ 	$(XRANDR_LIBS)									\
+-	$(X_LIBS)
++	$(X_LIBS)									\
++	$(LIBM)
+ 
+ gnome_panel_LDFLAGS = -export-dynamic
+ 
+-- 
+1.7.12.3
+
diff --git a/gnome-base/gnome-panel/gnome-panel-2.32.1-r1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.32.1-r1.ebuild
deleted file mode 100644
index e70337cfe0e8..000000000000
--- a/gnome-base/gnome-panel/gnome-panel-2.32.1-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.32.1-r1.ebuild,v 1.16 2012/05/05 05:38:11 jdhore Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="2:2.5"
-
-inherit gnome2 multilib python eutils autotools
-
-DESCRIPTION="The GNOME panel"
-HOMEPAGE="http://www.gnome.org/"
-SRC_URI="${SRC_URI} mirror://gentoo/introspection-20110205.m4.tar.bz2"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+bonobo doc eds +introspection networkmanager"
-
-RDEPEND=">=gnome-base/gnome-desktop-2.26:2
-	>=x11-libs/pango-1.15.4[introspection?]
-	>=dev-libs/glib-2.25.12:2
-	>=x11-libs/gtk+-2.22:2[introspection?]
-	>=dev-libs/libgweather-2.27.90:2
-	<dev-libs/libgweather-2.90.1:2
-	dev-libs/libxml2:2
-	>=gnome-base/gconf-2.6.1:2[introspection?]
-	>=media-libs/libcanberra-0.23[gtk]
-	>=gnome-base/gnome-menus-2.27.92:0
-	gnome-base/librsvg:2
-	>=dev-libs/dbus-glib-0.80
-	>=sys-apps/dbus-1.1.2
-	>=x11-libs/cairo-1
-	x11-libs/libXau
-	>=x11-libs/libXrandr-1.2
-	bonobo? (
-		>=gnome-base/libbonobo-2.20.4
-		>=gnome-base/libbonoboui-2.1.1
-		>=gnome-base/orbit-2.4
-		>=x11-libs/libwnck-2.19.5:1 )
-	eds? ( >=gnome-extra/evolution-data-server-1.6 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-	networkmanager? ( >=net-misc/networkmanager-0.6.7 )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	>=app-text/gnome-doc-utils-0.3.2
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	~app-text/docbook-xml-dtd-4.1.2
-	doc? ( >=dev-util/gtk-doc-1 )
-	gnome-base/gnome-common
-	dev-util/gtk-doc-am"
-# eautoreconf needs
-#	gnome-base/gnome-common
-#	dev-util/gtk-doc-am
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-deprecation-flags
-		--disable-static
-		--disable-scrollkeeper
-		--disable-schemas-install
-		--with-in-process-applets=clock,notification-area,wncklet
-		$(use_enable bonobo)
-		$(use_enable networkmanager network-manager)
-		$(use_enable introspection)
-		$(use_enable eds)"
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	python_set_active_version 2
-}
-
-src_unpack() {
-	# If gobject-introspection is installed, we don't need the extra .m4
-	if has_version "dev-libs/gobject-introspection"; then
-		unpack ${P}.tar.bz2
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# List the objects before the libraries to fix build with --as-needed
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-
-	# Try to improve panel behavior on multiscreen systems, bug #348253, upstream #632369
-	epatch "${FILESDIR}/${PN}-2.32.1-fix-multiscreen.patch"
-	epatch "${FILESDIR}/${PN}-2.32.1-fix-multiscreen2.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	AT_M4DIR=${WORKDIR} eautoreconf
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-
-	# gnome-panel does not need la files for applets
-	find "${ED}"/usr/$(get_libdir)/${PN} -name "*.la" -delete
-	# no package could ever need this, remove it before anyone tries to
-	rm "${ED}"/usr/$(get_libdir)/libpanel-applet-3.la
-}
-
-pkg_postinst() {
-	local entries="${EROOT}etc/gconf/schemas/panel-default-setup.entries"
-	local gconftool="${EROOT}usr/bin/gconftool-2"
-
-	if [ -e "$entries" ]; then
-		einfo "Setting panel gconf defaults..."
-
-		GCONF_CONFIG_SOURCE="$("${gconftool}" --get-default-source | sed "s;:/;:${ROOT};")"
-
-		"${gconftool}" --direct --config-source \
-			"${GCONF_CONFIG_SOURCE}" --load="${entries}"
-	fi
-
-	# Calling this late so it doesn't process the GConf schemas file we already
-	# took care of.
-	gnome2_pkg_postinst
-}
diff --git a/gnome-base/gnome-panel/gnome-panel-2.32.1-r2.ebuild b/gnome-base/gnome-panel/gnome-panel-2.32.1-r2.ebuild
deleted file mode 100644
index 9ca4f6486139..000000000000
--- a/gnome-base/gnome-panel/gnome-panel-2.32.1-r2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.32.1-r2.ebuild,v 1.12 2012/05/05 05:38:11 jdhore Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="2:2.5"
-
-inherit gnome2 python eutils autotools
-
-DESCRIPTION="The GNOME panel"
-HOMEPAGE="http://www.gnome.org/"
-SRC_URI="${SRC_URI} mirror://gentoo/introspection-20110205.m4.tar.bz2
-	http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.bz2"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+bonobo doc eds +introspection networkmanager"
-
-RDEPEND=">=gnome-base/gnome-desktop-2.26:2
-	>=x11-libs/pango-1.15.4[introspection?]
-	>=dev-libs/glib-2.25.12:2
-	>=x11-libs/gtk+-2.22:2[introspection?]
-	>=dev-libs/libgweather-2.27.90:2
-	<dev-libs/libgweather-2.90.1:2
-	dev-libs/libxml2:2
-	>=gnome-base/gconf-2.6.1:2[introspection?]
-	>=media-libs/libcanberra-0.23[gtk]
-	>=gnome-base/gnome-menus-2.27.92:0
-	gnome-base/librsvg:2
-	>=dev-libs/dbus-glib-0.80
-	>=sys-apps/dbus-1.1.2
-	>=x11-libs/cairo-1
-	x11-libs/libXau
-	>=x11-libs/libXrandr-1.2
-	bonobo? (
-		>=gnome-base/libbonobo-2.20.4
-		>=gnome-base/libbonoboui-2.1.1
-		>=gnome-base/orbit-2.4
-		>=x11-libs/libwnck-2.19.5:1 )
-	eds? ( >=gnome-extra/evolution-data-server-1.6 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-	networkmanager? ( >=net-misc/networkmanager-0.6.7 )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	>=app-text/gnome-doc-utils-0.3.2
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	~app-text/docbook-xml-dtd-4.1.2
-	doc? ( >=dev-util/gtk-doc-1 )
-	gnome-base/gnome-common
-	dev-util/gtk-doc-am"
-# eautoreconf needs
-#	gnome-base/gnome-common
-#	dev-util/gtk-doc-am
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-deprecation-flags
-		--disable-static
-		--disable-scrollkeeper
-		--disable-schemas-install
-		$(use_enable bonobo)
-		$(use_enable networkmanager network-manager)
-		$(use_enable introspection)
-		$(use_enable eds)"
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	python_set_active_version 2
-}
-
-src_unpack() {
-	# If gobject-introspection is installed, we don't need the extra .m4
-	if has_version "dev-libs/gobject-introspection"; then
-		unpack ${P}.tar.bz2 ${P}-patches.tar.bz2
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# List the objects before the libraries to fix build with --as-needed
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-
-	# Try to improve panel behavior on multiscreen systems, bug #348253, upstream #632369
-	epatch "${FILESDIR}/${PN}-2.32.1-fix-multiscreen.patch"
-	epatch "${FILESDIR}/${PN}-2.32.1-fix-multiscreen2.patch"
-
-	# Apply multiple bugfixes from 2.32 and master branches
-	# Also use gnome-applications.menu instead of applications.menu as it's the default value for us.
-	epatch "${WORKDIR}/${P}-patches"/*.patch
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	AT_M4DIR=${WORKDIR} eautoreconf
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_postinst() {
-	local entries="${EROOT}etc/gconf/schemas/panel-default-setup.entries"
-	local gconftool="${EROOT}usr/bin/gconftool-2"
-
-	if [ -e "$entries" ]; then
-		einfo "Setting panel gconf defaults..."
-
-		GCONF_CONFIG_SOURCE="$("${gconftool}" --get-default-source | sed "s;:/;:${ROOT};")"
-
-		"${gconftool}" --direct --config-source \
-			"${GCONF_CONFIG_SOURCE}" --load="${entries}"
-	fi
-
-	# Calling this late so it doesn't process the GConf schemas file we already
-	# took care of.
-	gnome2_pkg_postinst
-}
diff --git a/gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild b/gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild
index e5a6b8364bd0..04f16f1d36c9 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild,v 1.11 2012/05/05 05:38:11 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild,v 1.12 2012/10/16 03:47:52 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -14,10 +14,10 @@ HOMEPAGE="http://www.gnome.org/"
 SRC_URI="${SRC_URI} mirror://gentoo/introspection-20110205.m4.tar.bz2
 	http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.bz2"
 
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+bonobo doc eds +introspection networkmanager"
+IUSE="+bonobo eds +introspection networkmanager"
 
 RDEPEND=">=gnome-base/gnome-desktop-2.26:2
 	>=x11-libs/pango-1.15.4[introspection?]
@@ -45,16 +45,14 @@ RDEPEND=">=gnome-base/gnome-desktop-2.26:2
 	networkmanager? ( >=net-misc/networkmanager-0.6.7 )"
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5
+	dev-util/gtk-doc-am
 	>=app-text/gnome-doc-utils-0.3.2
 	virtual/pkgconfig
 	>=dev-util/intltool-0.40
-	~app-text/docbook-xml-dtd-4.1.2
-	doc? ( >=dev-util/gtk-doc-1 )
-	gnome-base/gnome-common
-	dev-util/gtk-doc-am"
+	app-text/docbook-xml-dtd:4.1.2
+	gnome-base/gnome-common"
 # eautoreconf needs
 #	gnome-base/gnome-common
-#	dev-util/gtk-doc-am
 
 pkg_setup() {
 	G2CONF="${G2CONF}
@@ -94,7 +92,9 @@ src_prepare() {
 	# clock applet: Pass the correct month to Evolution command line
 	epatch "${FILESDIR}/${PN}-2.32.1-evo-month.patch"
 
-	intltoolize --force --copy --automake || die "intltoolize failed"
+	# Fix underlinking, bug #384533
+	epatch "${FILESDIR}/${P}-underlinking.patch"
+
 	AT_M4DIR=${WORKDIR} eautoreconf
 	gnome2_src_prepare
 }
diff --git a/gnome-base/gnome-panel/gnome-panel-3.2.1.ebuild b/gnome-base/gnome-panel/gnome-panel-3.2.1.ebuild
index 2ce2c3523563..49c90c3e6114 100644
--- a/gnome-base/gnome-panel/gnome-panel-3.2.1.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-3.2.1.ebuild,v 1.3 2012/06/07 10:49:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-3.2.1.ebuild,v 1.4 2012/10/16 03:47:52 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -11,9 +11,9 @@ inherit gnome2
 DESCRIPTION="The GNOME panel"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="0"
-IUSE="doc eds +introspection networkmanager"
+IUSE="eds +introspection networkmanager"
 # Odd behaviour w.r.t. panels: https://bugzilla.gnome.org/show_bug.cgi?id=631553
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 
@@ -42,14 +42,13 @@ RDEPEND=">=gnome-base/gnome-desktop-2.91:3
 	networkmanager? ( >=net-misc/networkmanager-0.6.7 )"
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5
+	dev-util/gtk-doc-am
 	>=app-text/gnome-doc-utils-0.3.2
 	virtual/pkgconfig
 	>=dev-util/intltool-0.40
-	~app-text/docbook-xml-dtd-4.1.2
-	doc? ( >=dev-util/gtk-doc-1 )"
+	app-text/docbook-xml-dtd:4.1.2"
 # eautoreconf needs
 #	gnome-base/gnome-common
-#	dev-util/gtk-doc-am
 
 pkg_setup() {
 	# XXX: Make presence/telepathy-glib support optional?
diff --git a/gnome-base/gnome-panel/gnome-panel-3.4.1.ebuild b/gnome-base/gnome-panel/gnome-panel-3.4.1.ebuild
deleted file mode 100644
index 033df5642a32..000000000000
--- a/gnome-base/gnome-panel/gnome-panel-3.4.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-3.4.1.ebuild,v 1.1 2012/05/14 06:06:14 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="The GNOME panel"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-IUSE="doc eds +introspection networkmanager"
-# Odd behaviour w.r.t. panels: https://bugzilla.gnome.org/show_bug.cgi?id=631553
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND=">=dev-libs/glib-2.31.14:2
-	>=dev-libs/libgweather-2.91:2
-	dev-libs/libxml2:2
-	gnome-base/dconf
-	>=gnome-base/gconf-2.6.1:2[introspection?]
-	>=gnome-base/gnome-desktop-2.91:3
-	>=gnome-base/gnome-menus-3.1.4:3
-	gnome-base/gsettings-desktop-schemas
-	gnome-base/librsvg:2
-	>=net-libs/telepathy-glib-0.14.0
-	sys-auth/polkit
-	>=x11-libs/cairo-1[X]
-	>=x11-libs/gdk-pixbuf-2.25.2:2
-	>=x11-libs/gtk+-3.3.8:3[introspection?]
-	x11-libs/libXau
-	x11-libs/libICE
-	x11-libs/libSM
-	>=x11-libs/libXrandr-1.2
-	>=x11-libs/libwnck-2.91:3
-	>=x11-libs/pango-1.15.4[introspection?]
-
-	eds? ( >=gnome-extra/evolution-data-server-2.91.2 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	networkmanager? ( >=net-misc/networkmanager-0.6.7 )"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=app-text/gnome-doc-utils-0.3.2
-	>=dev-lang/perl-5
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1 )"
-# eautoreconf needs
-#	gnome-base/gnome-common
-#	dev-util/gtk-doc-am
-
-pkg_setup() {
-	# XXX: Make presence/telepathy-glib support optional?
-	#      We can do that if we intend to support fallback-only as a setup
-	G2CONF="${G2CONF}
-		--disable-deprecation-flags
-		--disable-static
-		--disable-scrollkeeper
-		--disable-schemas-install
-		--disable-schemas-compile
-		--with-in-process-applets=clock,notification-area,wncklet
-		--enable-telepathy-glib
-		$(use_enable networkmanager network-manager)
-		$(use_enable introspection)
-		$(use_enable eds)"
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-}
-
-pkg_postinst() {
-	local entries="${EROOT}etc/gconf/schemas/panel-default-setup.entries"
-	local gconftool="${EROOT}usr/bin/gconftool-2"
-
-	if [ -e "$entries" ]; then
-		einfo "Setting panel gconf defaults..."
-
-		GCONF_CONFIG_SOURCE="$("${gconftool}" --get-default-source | sed "s;:/;:${ROOT};")"
-
-		"${gconftool}" --direct --config-source \
-			"${GCONF_CONFIG_SOURCE}" --load="${entries}"
-	fi
-
-	# Calling this late so it doesn't process the GConf schemas file we already
-	# took care of.
-	gnome2_pkg_postinst
-}
diff --git a/gnome-base/gnome-panel/gnome-panel-3.4.2.1.ebuild b/gnome-base/gnome-panel/gnome-panel-3.4.2.1.ebuild
index a0147374c461..90d3de1b6846 100644
--- a/gnome-base/gnome-panel/gnome-panel-3.4.2.1.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-3.4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-3.4.2.1.ebuild,v 1.1 2012/08/09 09:15:00 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-3.4.2.1.ebuild,v 1.2 2012/10/16 03:47:52 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -11,9 +11,9 @@ inherit autotools eutils gnome2
 DESCRIPTION="The GNOME panel"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="0"
-IUSE="doc eds +introspection networkmanager"
+IUSE="eds +introspection networkmanager"
 # Odd behaviour w.r.t. panels: https://bugzilla.gnome.org/show_bug.cgi?id=631553
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 
@@ -45,16 +45,14 @@ DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	>=app-text/gnome-doc-utils-0.3.2
 	>=dev-lang/perl-5
+	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1 )
 
 	dev-libs/gobject-introspection-common
-	dev-util/gtk-doc-am
 	gnome-base/gnome-common"
 # eautoreconf needs
 #	dev-libs/gobject-introspection-common
-#	dev-util/gtk-doc-am
 #	gnome-base/gnome-common
 
 pkg_setup() {