| 1 |
dirtyepic 07/12/12 04:09:13 |
| 2 |
|
| 3 |
Modified: ChangeLog wxGTK-2.6.4.0-r2.ebuild |
| 4 |
wxGTK-2.8.7.1.ebuild |
| 5 |
Log: |
| 6 |
Move eselect-wxwidgets to PDEPEND to prevent blocker on upgrade. Because |
| 7 |
wxGTK may now be installed before eselect-wxwidgets, make post{inst,rm} |
| 8 |
update conditional on it being available. Remove messy |
| 9 |
auto-set-profile-if-profile-is-"none" stuff and just default to "none". |
| 10 |
(Portage version: 2.1.4_rc9) |
| 11 |
|
| 12 |
Revision Changes Path |
| 13 |
1.169 x11-libs/wxGTK/ChangeLog |
| 14 |
|
| 15 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/ChangeLog?rev=1.169&view=markup |
| 16 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/ChangeLog?rev=1.169&content-type=text/plain |
| 17 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/ChangeLog?r1=1.168&r2=1.169 |
| 18 |
|
| 19 |
Index: ChangeLog |
| 20 |
=================================================================== |
| 21 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v |
| 22 |
retrieving revision 1.168 |
| 23 |
retrieving revision 1.169 |
| 24 |
diff -u -r1.168 -r1.169 |
| 25 |
--- ChangeLog 6 Dec 2007 02:13:33 -0000 1.168 |
| 26 |
+++ ChangeLog 12 Dec 2007 04:09:12 -0000 1.169 |
| 27 |
@@ -1,6 +1,13 @@ |
| 28 |
# ChangeLog for x11-libs/wxGTK |
| 29 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 30 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.168 2007/12/06 02:13:33 dirtyepic Exp $ |
| 31 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.169 2007/12/12 04:09:12 dirtyepic Exp $ |
| 32 |
+ |
| 33 |
+ 12 Dec 2007; Ryan Hill <dirtyepic@g.o> wxGTK-2.6.4.0-r2.ebuild, |
| 34 |
+ wxGTK-2.8.7.1.ebuild: |
| 35 |
+ Move eselect-wxwidgets to PDEPEND to prevent blocker on upgrade. Because |
| 36 |
+ wxGTK may now be installed before eselect-wxwidgets, make post{inst,rm} |
| 37 |
+ update conditional on it being available. Remove messy |
| 38 |
+ auto-set-profile-if-profile-is-"none" stuff and just default to "none". |
| 39 |
|
| 40 |
06 Dec 2007; Ryan Hill <dirtyepic@g.o> wxGTK-2.6.4.0-r1.ebuild: |
| 41 |
Backport precompiled header option from later ebuilds for hardened. Bug |
| 42 |
|
| 43 |
|
| 44 |
|
| 45 |
1.5 x11-libs/wxGTK/wxGTK-2.6.4.0-r2.ebuild |
| 46 |
|
| 47 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r2.ebuild?rev=1.5&view=markup |
| 48 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r2.ebuild?rev=1.5&content-type=text/plain |
| 49 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r2.ebuild?r1=1.4&r2=1.5 |
| 50 |
|
| 51 |
Index: wxGTK-2.6.4.0-r2.ebuild |
| 52 |
=================================================================== |
| 53 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r2.ebuild,v |
| 54 |
retrieving revision 1.4 |
| 55 |
retrieving revision 1.5 |
| 56 |
diff -u -r1.4 -r1.5 |
| 57 |
--- wxGTK-2.6.4.0-r2.ebuild 30 Nov 2007 00:56:39 -0000 1.4 |
| 58 |
+++ wxGTK-2.6.4.0-r2.ebuild 12 Dec 2007 04:09:12 -0000 1.5 |
| 59 |
@@ -1,6 +1,6 @@ |
| 60 |
# Copyright 1999-2007 Gentoo Foundation |
| 61 |
# Distributed under the terms of the GNU General Public License v2 |
| 62 |
-# $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 $ |
| 63 |
+# $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 $ |
| 64 |
|
| 65 |
inherit eutils versionator flag-o-matic |
| 66 |
|
| 67 |
@@ -36,13 +36,14 @@ |
| 68 |
|
| 69 |
DEPEND="${RDEPEND} |
| 70 |
dev-util/pkgconfig |
| 71 |
- app-admin/eselect-wxwidgets |
| 72 |
X? ( |
| 73 |
x11-proto/xproto |
| 74 |
x11-proto/xineramaproto |
| 75 |
x11-proto/xf86vidmodeproto |
| 76 |
)" |
| 77 |
|
| 78 |
+PDEPEND="app-admin/eselect-wxwidgets" |
| 79 |
+ |
| 80 |
SLOT="2.6" |
| 81 |
LICENSE="wxWinLL-3 |
| 82 |
GPL-2 |
| 83 |
@@ -144,21 +145,13 @@ |
| 84 |
} |
| 85 |
|
| 86 |
pkg_postinst() { |
| 87 |
- if [[ ! -e /var/lib/wxwidgets/current \ |
| 88 |
- || $(grep 'WXCONFIG="none"' /var/lib/wxwidgets/current) ]]; then |
| 89 |
- local wxchar wxtoolkit wxdebug |
| 90 |
- [[ ${SLOT} == 2.6 ]] && wxchar=ansi || wxchar=unicode |
| 91 |
- use X && wxtoolkit=gtk2 || wxtoolkit=base |
| 92 |
- use debug && wxdebug=debug || wxdebug=release |
| 93 |
- |
| 94 |
- eselect wxwidgets set ${wxtoolkit}-${wxchar}-${wxdebug}-${SLOT} |
| 95 |
- else |
| 96 |
- eselect wxwidgets update |
| 97 |
- fi |
| 98 |
+ has_version app-admin/eselect-wxwidgets \ |
| 99 |
+ && eselect wxwidgets update |
| 100 |
} |
| 101 |
|
| 102 |
pkg_postrm() { |
| 103 |
- eselect wxwidgets update |
| 104 |
+ has_version app-admin/eselect-wxwidgets \ |
| 105 |
+ && eselect wxwidgets update |
| 106 |
} |
| 107 |
|
| 108 |
build_wx() { |
| 109 |
|
| 110 |
|
| 111 |
|
| 112 |
1.3 x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild |
| 113 |
|
| 114 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild?rev=1.3&view=markup |
| 115 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild?rev=1.3&content-type=text/plain |
| 116 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild?r1=1.2&r2=1.3 |
| 117 |
|
| 118 |
Index: wxGTK-2.8.7.1.ebuild |
| 119 |
=================================================================== |
| 120 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild,v |
| 121 |
retrieving revision 1.2 |
| 122 |
retrieving revision 1.3 |
| 123 |
diff -u -r1.2 -r1.3 |
| 124 |
--- wxGTK-2.8.7.1.ebuild 4 Dec 2007 18:42:40 -0000 1.2 |
| 125 |
+++ wxGTK-2.8.7.1.ebuild 12 Dec 2007 04:09:12 -0000 1.3 |
| 126 |
@@ -1,6 +1,6 @@ |
| 127 |
# Copyright 1999-2007 Gentoo Foundation |
| 128 |
# Distributed under the terms of the GNU General Public License v2 |
| 129 |
-# $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 $ |
| 130 |
+# $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 $ |
| 131 |
|
| 132 |
inherit eutils versionator flag-o-matic |
| 133 |
|
| 134 |
@@ -39,13 +39,14 @@ |
| 135 |
|
| 136 |
DEPEND="${RDEPEND} |
| 137 |
dev-util/pkgconfig |
| 138 |
- app-admin/eselect-wxwidgets |
| 139 |
X? ( |
| 140 |
x11-proto/xproto |
| 141 |
x11-proto/xineramaproto |
| 142 |
x11-proto/xf86vidmodeproto |
| 143 |
)" |
| 144 |
|
| 145 |
+PDEPEND="app-admin/eselect-wxwidgets" |
| 146 |
+ |
| 147 |
SLOT="2.8" |
| 148 |
LICENSE="wxWinLL-3 |
| 149 |
GPL-2 |
| 150 |
@@ -140,19 +141,11 @@ |
| 151 |
} |
| 152 |
|
| 153 |
pkg_postinst() { |
| 154 |
- if [[ ! -e /var/lib/wxwidgets/current \ |
| 155 |
- || $(grep 'WXCONFIG="none"' /var/lib/wxwidgets/current) ]]; then |
| 156 |
- local wxchar wxtoolkit wxdebug |
| 157 |
- [[ ${SLOT} == 2.6 ]] && wxchar=ansi || wxchar=unicode |
| 158 |
- use X && wxtoolkit=gtk2 || wxtoolkit=base |
| 159 |
- use debug && wxdebug=debug || wxdebug=release |
| 160 |
- |
| 161 |
- eselect wxwidgets set ${wxtoolkit}-${wxchar}-${wxdebug}-${SLOT} |
| 162 |
- else |
| 163 |
- eselect wxwidgets update |
| 164 |
- fi |
| 165 |
+ has_version app-admin/eselect-wxwidgets \ |
| 166 |
+ && eselect wxwidgets update |
| 167 |
} |
| 168 |
|
| 169 |
pkg_postrm() { |
| 170 |
- eselect wxwidgets update |
| 171 |
+ has_version app-admin/eselect-wxwidgets \ |
| 172 |
+ && eselect wxwidgets update |
| 173 |
} |
| 174 |
|
| 175 |
|
| 176 |
|
| 177 |
-- |
| 178 |
gentoo-commits@g.o mailing list |
Archives