Move eselect-wxwidgets to PDEPEND to prevent blocker on upgrade. Because

wxGTK may now be installed before eselect-wxwidgets, make post{inst,rm}
update conditional on it being available. Remove messy
auto-set-profile-if-profile-is-"none" stuff and just default to "none".
(Portage version: 2.1.4_rc9)

3 files changed, 22 insertions, 29 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index dc742f9d7e5c..5317c8bc1b8b 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.168 2007/12/06 02:13:33 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.169 2007/12/12 04:09:12 dirtyepic Exp $
+
+  12 Dec 2007; Ryan Hill <dirtyepic@gentoo.org> wxGTK-2.6.4.0-r2.ebuild,
+  wxGTK-2.8.7.1.ebuild:
+  Move eselect-wxwidgets to PDEPEND to prevent blocker on upgrade. Because
+  wxGTK may now be installed before eselect-wxwidgets, make post{inst,rm}
+  update conditional on it being available. Remove messy
+  auto-set-profile-if-profile-is-"none" stuff and just default to "none".
 
   06 Dec 2007; Ryan Hill <dirtyepic@gentoo.org> wxGTK-2.6.4.0-r1.ebuild:
   Backport precompiled header option from later ebuilds for hardened. Bug
diff --git a/x11-libs/wxGTK/wxGTK-2.6.4.0-r2.ebuild b/x11-libs/wxGTK/wxGTK-2.6.4.0-r2.ebuild
index 5aa1fc61e83f..0551499e1903 100644
--- a/x11-libs/wxGTK/wxGTK-2.6.4.0-r2.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.6.4.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r2.ebuild,v 1.4 2007/11/30 00:56:39 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r2.ebuild,v 1.5 2007/12/12 04:09:12 dirtyepic Exp $
 
 inherit eutils versionator flag-o-matic
 
@@ -36,13 +36,14 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 		dev-util/pkgconfig
-		app-admin/eselect-wxwidgets
 		X?	(
 			x11-proto/xproto
 			x11-proto/xineramaproto
 			x11-proto/xf86vidmodeproto
 			)"
 
+PDEPEND="app-admin/eselect-wxwidgets"
+
 SLOT="2.6"
 LICENSE="wxWinLL-3
 		GPL-2
@@ -144,21 +145,13 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ ! -e /var/lib/wxwidgets/current \
-		|| $(grep 'WXCONFIG="none"' /var/lib/wxwidgets/current) ]]; then
-		local wxchar wxtoolkit wxdebug
-		[[ ${SLOT} == 2.6 ]] && wxchar=ansi || wxchar=unicode
-		use X && wxtoolkit=gtk2 || wxtoolkit=base
-		use debug && wxdebug=debug || wxdebug=release
-
-		eselect wxwidgets set ${wxtoolkit}-${wxchar}-${wxdebug}-${SLOT}
-	else
-		eselect wxwidgets update
-	fi
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
 }
 
 pkg_postrm() {
-	eselect wxwidgets update
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
 }
 
 build_wx() {
diff --git a/x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild b/x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild
index 2eeab87374ea..2e9f488ec549 100644
--- a/x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild,v 1.2 2007/12/04 18:42:40 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild,v 1.3 2007/12/12 04:09:12 dirtyepic Exp $
 
 inherit eutils versionator flag-o-matic
 
@@ -39,13 +39,14 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 		dev-util/pkgconfig
-		app-admin/eselect-wxwidgets
 		X?  (
 			x11-proto/xproto
 			x11-proto/xineramaproto
 			x11-proto/xf86vidmodeproto
 			)"
 
+PDEPEND="app-admin/eselect-wxwidgets"
+
 SLOT="2.8"
 LICENSE="wxWinLL-3
 		GPL-2
@@ -140,19 +141,11 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ ! -e /var/lib/wxwidgets/current \
-		|| $(grep 'WXCONFIG="none"' /var/lib/wxwidgets/current) ]]; then
-		local wxchar wxtoolkit wxdebug
-		[[ ${SLOT} == 2.6 ]] && wxchar=ansi || wxchar=unicode
-		use X && wxtoolkit=gtk2 || wxtoolkit=base
-		use debug && wxdebug=debug || wxdebug=release
-
-		eselect wxwidgets set ${wxtoolkit}-${wxchar}-${wxdebug}-${SLOT}
-	else
-		eselect wxwidgets update
-	fi
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
 }
 
 pkg_postrm() {
-	eselect wxwidgets update
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
 }