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

(Portage version: 2.2.0_alpha137/cvs/Linux x86_64)

8 files changed, 69 insertions, 348 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/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() {