| 1 |
zmedico 12/09/01 20:15:23 |
| 2 |
|
| 3 |
Modified: portage-2.1.6.7_p1.ebuild portage-2.1.11.9.ebuild |
| 4 |
portage-9999.ebuild portage-2.2.0_alpha120.ebuild |
| 5 |
portage-2.2.0_alpha123.ebuild |
| 6 |
portage-2.1.11.12.ebuild ChangeLog |
| 7 |
Log: |
| 8 |
Install in /usr/lib instead of using multilib get_libdir, since current versions of portage are do not install any ELF binaries. |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha123/cvs/Linux i686) |
| 11 |
|
| 12 |
Revision Changes Path |
| 13 |
1.3 sys-apps/portage/portage-2.1.6.7_p1.ebuild |
| 14 |
|
| 15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.6.7_p1.ebuild?rev=1.3&view=markup |
| 16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.6.7_p1.ebuild?rev=1.3&content-type=text/plain |
| 17 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.6.7_p1.ebuild?r1=1.2&r2=1.3 |
| 18 |
|
| 19 |
Index: portage-2.1.6.7_p1.ebuild |
| 20 |
=================================================================== |
| 21 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.7_p1.ebuild,v |
| 22 |
retrieving revision 1.2 |
| 23 |
retrieving revision 1.3 |
| 24 |
diff -u -r1.2 -r1.3 |
| 25 |
--- portage-2.1.6.7_p1.ebuild 4 Aug 2012 19:57:41 -0000 1.2 |
| 26 |
+++ portage-2.1.6.7_p1.ebuild 1 Sep 2012 20:15:23 -0000 1.3 |
| 27 |
@@ -1,8 +1,8 @@ |
| 28 |
# Copyright 1999-2012 Gentoo Foundation |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.7_p1.ebuild,v 1.2 2012/08/04 19:57:41 zmedico Exp $ |
| 31 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.7_p1.ebuild,v 1.3 2012/09/01 20:15:23 zmedico Exp $ |
| 32 |
|
| 33 |
-inherit eutils multilib python |
| 34 |
+inherit eutils python |
| 35 |
|
| 36 |
DESCRIPTION="Portage is the package management and distribution system for Gentoo" |
| 37 |
HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml" |
| 38 |
@@ -64,12 +64,6 @@ |
| 39 |
S="${WORKDIR}"/${PN}-${TARBALL_PV} |
| 40 |
S_PL="${WORKDIR}"/${PN}-${PV_PL} |
| 41 |
|
| 42 |
-pkg_setup() { |
| 43 |
- # Bug #359731 - Die early if get_libdir fails. |
| 44 |
- [[ -z $(get_libdir) ]] && \ |
| 45 |
- die "get_libdir returned an empty string" |
| 46 |
-} |
| 47 |
- |
| 48 |
src_unpack() { |
| 49 |
unpack ${A} |
| 50 |
cd "${S}" |
| 51 |
@@ -119,8 +113,7 @@ |
| 52 |
} |
| 53 |
|
| 54 |
src_install() { |
| 55 |
- local libdir=$(get_libdir) |
| 56 |
- local portage_base="/usr/${libdir}/portage" |
| 57 |
+ local portage_base="/usr/lib/portage" |
| 58 |
local portage_share_config=/usr/share/portage/config |
| 59 |
|
| 60 |
cd "${S}"/cnf |
| 61 |
@@ -191,14 +184,14 @@ |
| 62 |
|
| 63 |
dodir /usr/bin |
| 64 |
for x in ebuild emerge portageq repoman xpak; do |
| 65 |
- dosym ../${libdir}/portage/bin/${x} /usr/bin/${x} |
| 66 |
+ dosym ../lib/portage/bin/${x} /usr/bin/${x} |
| 67 |
done |
| 68 |
|
| 69 |
dodir /usr/sbin |
| 70 |
local x |
| 71 |
for x in archive-conf dispatch-conf emaint emerge-webrsync env-update \ |
| 72 |
etc-update fixpackages quickpkg regenworld ; do |
| 73 |
- dosym ../${libdir}/portage/bin/${x} /usr/sbin/${x} |
| 74 |
+ dosym ../lib/portage/bin/${x} /usr/sbin/${x} |
| 75 |
done |
| 76 |
dosym env-update /usr/sbin/update-env |
| 77 |
dosym etc-update /usr/sbin/update-etc |
| 78 |
@@ -220,7 +213,7 @@ |
| 79 |
pkg_postinst() { |
| 80 |
# Compile all source files recursively. Any orphans |
| 81 |
# will be identified and removed in postrm. |
| 82 |
- python_mod_optimize /usr/$(get_libdir)/portage/pym |
| 83 |
+ python_mod_optimize /usr/lib/portage/pym |
| 84 |
|
| 85 |
local warning_shown=0 |
| 86 |
if [ $DOWNGRADE_FROM_2_2 = 0 ] ; then |
| 87 |
@@ -259,5 +252,5 @@ |
| 88 |
} |
| 89 |
|
| 90 |
pkg_postrm() { |
| 91 |
- python_mod_cleanup /usr/$(get_libdir)/portage/pym |
| 92 |
+ python_mod_cleanup /usr/lib/portage/pym |
| 93 |
} |
| 94 |
|
| 95 |
|
| 96 |
|
| 97 |
1.9 sys-apps/portage/portage-2.1.11.9.ebuild |
| 98 |
|
| 99 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.11.9.ebuild?rev=1.9&view=markup |
| 100 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.11.9.ebuild?rev=1.9&content-type=text/plain |
| 101 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.11.9.ebuild?r1=1.8&r2=1.9 |
| 102 |
|
| 103 |
Index: portage-2.1.11.9.ebuild |
| 104 |
=================================================================== |
| 105 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.9.ebuild,v |
| 106 |
retrieving revision 1.8 |
| 107 |
retrieving revision 1.9 |
| 108 |
diff -u -r1.8 -r1.9 |
| 109 |
--- portage-2.1.11.9.ebuild 26 Aug 2012 19:15:17 -0000 1.8 |
| 110 |
+++ portage-2.1.11.9.ebuild 1 Sep 2012 20:15:23 -0000 1.9 |
| 111 |
@@ -1,11 +1,11 @@ |
| 112 |
# Copyright 1999-2012 Gentoo Foundation |
| 113 |
# Distributed under the terms of the GNU General Public License v2 |
| 114 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.9.ebuild,v 1.8 2012/08/26 19:15:17 armin76 Exp $ |
| 115 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.9.ebuild,v 1.9 2012/09/01 20:15:23 zmedico Exp $ |
| 116 |
|
| 117 |
# Require EAPI 2 since we now require at least python-2.6 (for python 3 |
| 118 |
# syntax support) which also requires EAPI 2. |
| 119 |
EAPI=2 |
| 120 |
-inherit eutils multilib python |
| 121 |
+inherit eutils python |
| 122 |
|
| 123 |
DESCRIPTION="Portage is the package management and distribution system for Gentoo" |
| 124 |
HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml" |
| 125 |
@@ -98,10 +98,6 @@ |
| 126 |
} |
| 127 |
|
| 128 |
pkg_setup() { |
| 129 |
- # Bug #359731 - Die early if get_libdir fails. |
| 130 |
- [[ -z $(get_libdir) ]] && \ |
| 131 |
- die "get_libdir returned an empty string" |
| 132 |
- |
| 133 |
if use python2 && use python3 ; then |
| 134 |
ewarn "Both python2 and python3 USE flags are enabled, but only one" |
| 135 |
ewarn "can be in the shebangs. Using python3." |
| 136 |
@@ -221,7 +217,6 @@ |
| 137 |
emake DESTDIR="${D}" \ |
| 138 |
sysconfdir="/etc" \ |
| 139 |
prefix="/usr" \ |
| 140 |
- libdir="/usr/$(get_libdir)" \ |
| 141 |
install || die |
| 142 |
|
| 143 |
# Use dodoc for compression, since the Makefile doesn't do that. |
| 144 |
@@ -282,9 +277,9 @@ |
| 145 |
pkg_postinst() { |
| 146 |
# Compile all source files recursively. Any orphans |
| 147 |
# will be identified and removed in postrm. |
| 148 |
- python_mod_optimize /usr/$(get_libdir)/portage/pym |
| 149 |
+ python_mod_optimize /usr/lib/portage/pym |
| 150 |
} |
| 151 |
|
| 152 |
pkg_postrm() { |
| 153 |
- python_mod_cleanup /usr/$(get_libdir)/portage/pym |
| 154 |
+ python_mod_cleanup /usr/lib/portage/pym |
| 155 |
} |
| 156 |
|
| 157 |
|
| 158 |
|
| 159 |
1.56 sys-apps/portage/portage-9999.ebuild |
| 160 |
|
| 161 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.56&view=markup |
| 162 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.56&content-type=text/plain |
| 163 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.55&r2=1.56 |
| 164 |
|
| 165 |
Index: portage-9999.ebuild |
| 166 |
=================================================================== |
| 167 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v |
| 168 |
retrieving revision 1.55 |
| 169 |
retrieving revision 1.56 |
| 170 |
diff -u -r1.55 -r1.56 |
| 171 |
--- portage-9999.ebuild 4 Aug 2012 19:57:41 -0000 1.55 |
| 172 |
+++ portage-9999.ebuild 1 Sep 2012 20:15:23 -0000 1.56 |
| 173 |
@@ -1,9 +1,9 @@ |
| 174 |
# Copyright 1999-2012 Gentoo Foundation |
| 175 |
# Distributed under the terms of the GNU General Public License v2 |
| 176 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.55 2012/08/04 19:57:41 zmedico Exp $ |
| 177 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.56 2012/09/01 20:15:23 zmedico Exp $ |
| 178 |
|
| 179 |
EAPI=3 |
| 180 |
-inherit git-2 eutils multilib python |
| 181 |
+inherit git-2 eutils python |
| 182 |
|
| 183 |
DESCRIPTION="Portage is the package management and distribution system for Gentoo" |
| 184 |
HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml" |
| 185 |
@@ -81,10 +81,6 @@ |
| 186 |
} |
| 187 |
|
| 188 |
pkg_setup() { |
| 189 |
- # Bug #359731 - Die early if get_libdir fails. |
| 190 |
- [[ -z $(get_libdir) ]] && \ |
| 191 |
- die "get_libdir returned an empty string" |
| 192 |
- |
| 193 |
if use python2 && use python3 ; then |
| 194 |
ewarn "Both python2 and python3 USE flags are enabled, but only one" |
| 195 |
ewarn "can be in the shebangs. Using python3." |
| 196 |
@@ -239,7 +235,6 @@ |
| 197 |
emake DESTDIR="${D}" \ |
| 198 |
sysconfdir="${EPREFIX}/etc" \ |
| 199 |
prefix="${EPREFIX}/usr" \ |
| 200 |
- libdir="${EPREFIX}/usr/$(get_libdir)" \ |
| 201 |
install || die |
| 202 |
|
| 203 |
# Use dodoc for compression, since the Makefile doesn't do that. |
| 204 |
@@ -285,7 +280,7 @@ |
| 205 |
pkg_postinst() { |
| 206 |
# Compile all source files recursively. Any orphans |
| 207 |
# will be identified and removed in postrm. |
| 208 |
- python_mod_optimize /usr/$(get_libdir)/portage/pym |
| 209 |
+ python_mod_optimize /usr/lib/portage/pym |
| 210 |
|
| 211 |
if $WORLD_MIGRATION_UPGRADE && \ |
| 212 |
grep -q "^@" "${EROOT}/var/lib/portage/world"; then |
| 213 |
@@ -316,5 +311,5 @@ |
| 214 |
} |
| 215 |
|
| 216 |
pkg_postrm() { |
| 217 |
- python_mod_cleanup /usr/$(get_libdir)/portage/pym |
| 218 |
+ python_mod_cleanup /usr/lib/portage/pym |
| 219 |
} |
| 220 |
|
| 221 |
|
| 222 |
|
| 223 |
1.3 sys-apps/portage/portage-2.2.0_alpha120.ebuild |
| 224 |
|
| 225 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha120.ebuild?rev=1.3&view=markup |
| 226 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha120.ebuild?rev=1.3&content-type=text/plain |
| 227 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha120.ebuild?r1=1.2&r2=1.3 |
| 228 |
|
| 229 |
Index: portage-2.2.0_alpha120.ebuild |
| 230 |
=================================================================== |
| 231 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha120.ebuild,v |
| 232 |
retrieving revision 1.2 |
| 233 |
retrieving revision 1.3 |
| 234 |
diff -u -r1.2 -r1.3 |
| 235 |
--- portage-2.2.0_alpha120.ebuild 4 Aug 2012 19:57:41 -0000 1.2 |
| 236 |
+++ portage-2.2.0_alpha120.ebuild 1 Sep 2012 20:15:23 -0000 1.3 |
| 237 |
@@ -1,11 +1,11 @@ |
| 238 |
# Copyright 1999-2012 Gentoo Foundation |
| 239 |
# Distributed under the terms of the GNU General Public License v2 |
| 240 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha120.ebuild,v 1.2 2012/08/04 19:57:41 zmedico Exp $ |
| 241 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha120.ebuild,v 1.3 2012/09/01 20:15:23 zmedico Exp $ |
| 242 |
|
| 243 |
# Require EAPI 2 since we now require at least python-2.6 (for python 3 |
| 244 |
# syntax support) which also requires EAPI 2. |
| 245 |
EAPI=3 |
| 246 |
-inherit eutils multilib python |
| 247 |
+inherit eutils python |
| 248 |
|
| 249 |
DESCRIPTION="Portage is the package management and distribution system for Gentoo" |
| 250 |
HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml" |
| 251 |
@@ -98,10 +98,6 @@ |
| 252 |
} |
| 253 |
|
| 254 |
pkg_setup() { |
| 255 |
- # Bug #359731 - Die early if get_libdir fails. |
| 256 |
- [[ -z $(get_libdir) ]] && \ |
| 257 |
- die "get_libdir returned an empty string" |
| 258 |
- |
| 259 |
if use python2 && use python3 ; then |
| 260 |
ewarn "Both python2 and python3 USE flags are enabled, but only one" |
| 261 |
ewarn "can be in the shebangs. Using python3." |
| 262 |
@@ -255,7 +251,6 @@ |
| 263 |
emake DESTDIR="${D}" \ |
| 264 |
sysconfdir="${EPREFIX}/etc" \ |
| 265 |
prefix="${EPREFIX}/usr" \ |
| 266 |
- libdir="${EPREFIX}/usr/$(get_libdir)" \ |
| 267 |
install || die |
| 268 |
|
| 269 |
# Use dodoc for compression, since the Makefile doesn't do that. |
| 270 |
@@ -310,7 +305,7 @@ |
| 271 |
pkg_postinst() { |
| 272 |
# Compile all source files recursively. Any orphans |
| 273 |
# will be identified and removed in postrm. |
| 274 |
- python_mod_optimize /usr/$(get_libdir)/portage/pym |
| 275 |
+ python_mod_optimize /usr/lib/portage/pym |
| 276 |
|
| 277 |
if $WORLD_MIGRATION_UPGRADE && \ |
| 278 |
grep -q "^@" "${EROOT}/var/lib/portage/world"; then |
| 279 |
@@ -341,5 +336,5 @@ |
| 280 |
} |
| 281 |
|
| 282 |
pkg_postrm() { |
| 283 |
- python_mod_cleanup /usr/$(get_libdir)/portage/pym |
| 284 |
+ python_mod_cleanup /usr/lib/portage/pym |
| 285 |
} |
| 286 |
|
| 287 |
|
| 288 |
|
| 289 |
1.2 sys-apps/portage/portage-2.2.0_alpha123.ebuild |
| 290 |
|
| 291 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha123.ebuild?rev=1.2&view=markup |
| 292 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha123.ebuild?rev=1.2&content-type=text/plain |
| 293 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha123.ebuild?r1=1.1&r2=1.2 |
| 294 |
|
| 295 |
Index: portage-2.2.0_alpha123.ebuild |
| 296 |
=================================================================== |
| 297 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha123.ebuild,v |
| 298 |
retrieving revision 1.1 |
| 299 |
retrieving revision 1.2 |
| 300 |
diff -u -r1.1 -r1.2 |
| 301 |
--- portage-2.2.0_alpha123.ebuild 26 Aug 2012 23:09:52 -0000 1.1 |
| 302 |
+++ portage-2.2.0_alpha123.ebuild 1 Sep 2012 20:15:23 -0000 1.2 |
| 303 |
@@ -1,11 +1,11 @@ |
| 304 |
# Copyright 1999-2012 Gentoo Foundation |
| 305 |
# Distributed under the terms of the GNU General Public License v2 |
| 306 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha123.ebuild,v 1.1 2012/08/26 23:09:52 zmedico Exp $ |
| 307 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha123.ebuild,v 1.2 2012/09/01 20:15:23 zmedico Exp $ |
| 308 |
|
| 309 |
# Require EAPI 2 since we now require at least python-2.6 (for python 3 |
| 310 |
# syntax support) which also requires EAPI 2. |
| 311 |
EAPI=3 |
| 312 |
-inherit eutils multilib python |
| 313 |
+inherit eutils python |
| 314 |
|
| 315 |
DESCRIPTION="Portage is the package management and distribution system for Gentoo" |
| 316 |
HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml" |
| 317 |
@@ -98,10 +98,6 @@ |
| 318 |
} |
| 319 |
|
| 320 |
pkg_setup() { |
| 321 |
- # Bug #359731 - Die early if get_libdir fails. |
| 322 |
- [[ -z $(get_libdir) ]] && \ |
| 323 |
- die "get_libdir returned an empty string" |
| 324 |
- |
| 325 |
if use python2 && use python3 ; then |
| 326 |
ewarn "Both python2 and python3 USE flags are enabled, but only one" |
| 327 |
ewarn "can be in the shebangs. Using python3." |
| 328 |
@@ -255,7 +251,6 @@ |
| 329 |
emake DESTDIR="${D}" \ |
| 330 |
sysconfdir="${EPREFIX}/etc" \ |
| 331 |
prefix="${EPREFIX}/usr" \ |
| 332 |
- libdir="${EPREFIX}/usr/$(get_libdir)" \ |
| 333 |
install || die |
| 334 |
|
| 335 |
# Use dodoc for compression, since the Makefile doesn't do that. |
| 336 |
@@ -306,7 +301,7 @@ |
| 337 |
pkg_postinst() { |
| 338 |
# Compile all source files recursively. Any orphans |
| 339 |
# will be identified and removed in postrm. |
| 340 |
- python_mod_optimize /usr/$(get_libdir)/portage/pym |
| 341 |
+ python_mod_optimize /usr/lib/portage/pym |
| 342 |
|
| 343 |
if $WORLD_MIGRATION_UPGRADE && \ |
| 344 |
grep -q "^@" "${EROOT}/var/lib/portage/world"; then |
| 345 |
@@ -337,5 +332,5 @@ |
| 346 |
} |
| 347 |
|
| 348 |
pkg_postrm() { |
| 349 |
- python_mod_cleanup /usr/$(get_libdir)/portage/pym |
| 350 |
+ python_mod_cleanup /usr/lib/portage/pym |
| 351 |
} |
| 352 |
|
| 353 |
|
| 354 |
|
| 355 |
1.2 sys-apps/portage/portage-2.1.11.12.ebuild |
| 356 |
|
| 357 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.11.12.ebuild?rev=1.2&view=markup |
| 358 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.11.12.ebuild?rev=1.2&content-type=text/plain |
| 359 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.11.12.ebuild?r1=1.1&r2=1.2 |
| 360 |
|
| 361 |
Index: portage-2.1.11.12.ebuild |
| 362 |
=================================================================== |
| 363 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.12.ebuild,v |
| 364 |
retrieving revision 1.1 |
| 365 |
retrieving revision 1.2 |
| 366 |
diff -u -r1.1 -r1.2 |
| 367 |
--- portage-2.1.11.12.ebuild 26 Aug 2012 23:08:55 -0000 1.1 |
| 368 |
+++ portage-2.1.11.12.ebuild 1 Sep 2012 20:15:23 -0000 1.2 |
| 369 |
@@ -1,11 +1,11 @@ |
| 370 |
# Copyright 1999-2012 Gentoo Foundation |
| 371 |
# Distributed under the terms of the GNU General Public License v2 |
| 372 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.12.ebuild,v 1.1 2012/08/26 23:08:55 zmedico Exp $ |
| 373 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.12.ebuild,v 1.2 2012/09/01 20:15:23 zmedico Exp $ |
| 374 |
|
| 375 |
# Require EAPI 2 since we now require at least python-2.6 (for python 3 |
| 376 |
# syntax support) which also requires EAPI 2. |
| 377 |
EAPI=2 |
| 378 |
-inherit eutils multilib python |
| 379 |
+inherit eutils python |
| 380 |
|
| 381 |
DESCRIPTION="Portage is the package management and distribution system for Gentoo" |
| 382 |
HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml" |
| 383 |
@@ -98,10 +98,6 @@ |
| 384 |
} |
| 385 |
|
| 386 |
pkg_setup() { |
| 387 |
- # Bug #359731 - Die early if get_libdir fails. |
| 388 |
- [[ -z $(get_libdir) ]] && \ |
| 389 |
- die "get_libdir returned an empty string" |
| 390 |
- |
| 391 |
if use python2 && use python3 ; then |
| 392 |
ewarn "Both python2 and python3 USE flags are enabled, but only one" |
| 393 |
ewarn "can be in the shebangs. Using python3." |
| 394 |
@@ -221,7 +217,6 @@ |
| 395 |
emake DESTDIR="${D}" \ |
| 396 |
sysconfdir="/etc" \ |
| 397 |
prefix="/usr" \ |
| 398 |
- libdir="/usr/$(get_libdir)" \ |
| 399 |
install || die |
| 400 |
|
| 401 |
# Use dodoc for compression, since the Makefile doesn't do that. |
| 402 |
@@ -279,9 +274,9 @@ |
| 403 |
pkg_postinst() { |
| 404 |
# Compile all source files recursively. Any orphans |
| 405 |
# will be identified and removed in postrm. |
| 406 |
- python_mod_optimize /usr/$(get_libdir)/portage/pym |
| 407 |
+ python_mod_optimize /usr/lib/portage/pym |
| 408 |
} |
| 409 |
|
| 410 |
pkg_postrm() { |
| 411 |
- python_mod_cleanup /usr/$(get_libdir)/portage/pym |
| 412 |
+ python_mod_cleanup /usr/lib/portage/pym |
| 413 |
} |
| 414 |
|
| 415 |
|
| 416 |
|
| 417 |
1.1082 sys-apps/portage/ChangeLog |
| 418 |
|
| 419 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1082&view=markup |
| 420 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1082&content-type=text/plain |
| 421 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1081&r2=1.1082 |
| 422 |
|
| 423 |
Index: ChangeLog |
| 424 |
=================================================================== |
| 425 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v |
| 426 |
retrieving revision 1.1081 |
| 427 |
retrieving revision 1.1082 |
| 428 |
diff -u -r1.1081 -r1.1082 |
| 429 |
--- ChangeLog 1 Sep 2012 19:58:14 -0000 1.1081 |
| 430 |
+++ ChangeLog 1 Sep 2012 20:15:23 -0000 1.1082 |
| 431 |
@@ -1,6 +1,13 @@ |
| 432 |
# ChangeLog for sys-apps/portage |
| 433 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 434 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1081 2012/09/01 19:58:14 zmedico Exp $ |
| 435 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1082 2012/09/01 20:15:23 zmedico Exp $ |
| 436 |
+ |
| 437 |
+ 01 Sep 2012; Zac Medico <zmedico@g.o> portage-2.1.11.12.ebuild, |
| 438 |
+ portage-2.1.11.9.ebuild, portage-2.1.6.7_p1.ebuild, |
| 439 |
+ portage-2.2.0_alpha120.ebuild, portage-2.2.0_alpha123.ebuild, |
| 440 |
+ portage-9999.ebuild: |
| 441 |
+ Install in /usr/lib instead of using multilib get_libdir, since current |
| 442 |
+ versions of portage are do not install any ELF binaries. |
| 443 |
|
| 444 |
01 Sep 2012; Zac Medico <zmedico@g.o> -portage-2.1.11.11.ebuild, |
| 445 |
-portage-2.2.0_alpha122.ebuild: |
Archives