bump(dev-lang/python-exec): sync with upstream

Packages updated:
  dev-lang/python-exec
  dev-python/python-exec
  eclass
  profiles
This commit is contained in:
Michael Marineau 2013-11-06 19:43:02 -08:00
parent 5ecc4ad7e0
commit a59fcae7ba
212 changed files with 4478 additions and 2321 deletions

View File

@ -0,0 +1,13 @@
# ChangeLog for dev-lang/python-exec
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/python-exec/ChangeLog,v 1.1 2013/10/30 19:12:16 mgorny Exp $
*python-exec-0.9999 (30 Oct 2013)
*python-exec-2.9999 (30 Oct 2013)
*python-exec-0.3.1 (30 Oct 2013)
*python-exec-2.0 (30 Oct 2013)
30 Oct 2013; Michał Górny <mgorny@gentoo.org> +metadata.xml,
+python-exec-0.3.1.ebuild, +python-exec-0.9999.ebuild,
+python-exec-2.0.ebuild, +python-exec-2.9999.ebuild:
Move the real ebuilds of dev-python/python-exec to dev-lang/python-exec.

View File

@ -0,0 +1,30 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
DIST python-exec-0.3.1.tar.bz2 74441 SHA256 460837775167108419b9497353a6f832fc8a249c341469dd235c70633ac37557 SHA512 764d1aaf3b4f9679be6ab1105b4b4d9222b245502114ee3d451b4507f86679ae05136eeae3337351c80b52ee03b9461a2f89c87e63cc4cbb76a1023fb243f84e WHIRLPOOL 6b34c2f44976a33a67269c766bd13401b6b1b39fad3d5df6bbef2bd06e15e09bd2ac13123718b8fa0bdb67f812c7407192b9c16860ab442d3c35259afeb3da82
DIST python-exec-2.0.tar.bz2 80777 SHA256 e8a2cf2bbaef012010f23b477d183b17d6021562beff3ede5c7e724a7ee00672 SHA512 ad77f46448461323c15d97f42ebb0a1f44d53397e42a89fdc600dbcc1ccf95a280252011c0b02d71125ca8095bb388d5b3e7e6cb3b93a1cee578a2b1b08b4594 WHIRLPOOL e483fc6eb6d7dd10bbd685c2f3cf9daa0f4165204a2b191c1ae685e8b3e6c7faec929a0bcee647dd94e6b2731f8c1950d0e02334ea8b587aa05cfbe644091367
EBUILD python-exec-0.3.1.ebuild 1136 SHA256 4c3cd3f6cce5b92ea1d818469c8d626dda62d8f1cbbec00b91b338cfcd2b6077 SHA512 b5bdcac19fcc26645953b19fc6520b89739f54ab9486a35ff2a1e01ffc52f0cbdacced82783694e1dbce086068f6207eb77d00902547c9d069d8d75041a56f7b WHIRLPOOL f0c8cbe61b245cac1ed284b24c0dcf884a9dd1409c076afcc08a1dfe5df4ad037b72334de86965bcb50846ce83edaff351f0c7f7c854fd19748113c3f871b28d
EBUILD python-exec-0.9999.ebuild 1296 SHA256 c2dd2676fa12efdc61321ed3ef8852ae4b86c39ea3ec31d777b1f1a0b3b1c042 SHA512 62837413354dc7611c442f0d16a0ff3f8db30118ac64825cba92d937532d88c736cdf0e1ff9800b856238a62cac15ddedd7886054421e90fba73cc372a9a1022 WHIRLPOOL 6f59647c6a639e73a0b32dc43b67da43968fcc463871e64a6c615aa9ff2d26663f02753605d0f1ef6c12f3d0eb560ad10f7e43104599e2d56a693ceb6bfd1db9
EBUILD python-exec-2.0.ebuild 1144 SHA256 af9dcbd24954d13d342a3c00e7a2f507f3ccf081364e275d89fd6a88729b708c SHA512 758affbc4456b1a6df95bf4422a932ba7bf732072b8548d104d86fc660d5d58d235cd8ed4e04e558ce321105bd165acb730881824486557ed3c03f7941593989 WHIRLPOOL e517da74674299ca695da87e353cb4ebb3dd23818b999d9e8c8a24fe4cce3a305e010138bd2e522cb4ab6ac58dff0222eeb10c44bc0ac3fa2ff2294dcf3e92f8
EBUILD python-exec-2.9999.ebuild 1323 SHA256 35de32f933d526c222b60b7545425244936ec1ee73108a35dccfea2604a5f2ef SHA512 a3c7ee8bfda3a9daad8f3145726c30cb3133585fcdd0ad3e7b79e50cf103544383bbc377cd86f6dffb5a874b6223a1b64ff3c799dccfaae75210b19ec27ef4d2 WHIRLPOOL 67f828b29d84c16a15e0794c576fde5a526d035b7fe0eae61ad6bd8db5e86d9e3c912cbbd85fde69d34bdefc28899ceabd99025236077c6d2b87d678e72bf70b
MISC ChangeLog 598 SHA256 c63feb193b1cfb1b7e31fa2b4c619ce4274007daf3a75fde9727e3e8c8445b9b SHA512 136277f21985920f78b7d1b7f859ba5c82660569ab3147bbed2481dbd493cf24453ea94a97f1cf2ff2d1c6e3167dc4e213543067a31b8a3c3ab382fbd0599185 WHIRLPOOL bb29f09c95e861bbe5276e9edd7509ef8304214ad2ff9307a87231fc930c1a30509f935e6bcc1b94ccfb340afeb1db9778cc58a646d1b0c86a84d002322f3fda
MISC metadata.xml 369 SHA256 8b6dcc8bc5a5198e3df4c844ebf07234f8c9eb1ff4e10fa7bccc07a0e5dc7517 SHA512 8cc3738e0fd501a4b374d9e18f5676c78d285549c88061aab63697011f43163275751341dc1199aa9a0e4eb3bc9c8e436df261ede8bcf2f759aab096a53d04e0 WHIRLPOOL c99edc69d860d148ebd3d004131e448a957a1f6a3cb3f32b51e94bed79eee6060e41f0de18edc6dd63b83f507f25ab6f0105e593d7d14b1050106aaa3b45e342
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
iQJ8BAEBCABmBQJScVorXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOYggP/R4z/5oNRrsKNVMyWlMB88Fy
2VMRBXgNtMAm1Za7YX9y9bCgUQOPlazCugtUUpmFVB0ST3XptsmxzAjD30GR3XVY
DUGrXTY96wmMGS9kFEPbX6lCbhENYhLb9LZTE/v9pssgI3+QEGgoHZOPCYckQpgJ
C+gIhzqB/xqLHW8put+PK2JjfjojwvQGqIbXzXxUWkvhnVe8ejl88AVzWzv1/BBy
aoa3lFSc23bjfVo1N6Z5/GcGGmhJVFE/UHnagzWqNzd+cJKS0TPwKi0pJe9Gd0FW
4ajl+U0e6wfm+r82BX/Hm6wK7ja0KA9dookNdwb121ZzjXVSdAxhGJ8IEfpTpJsy
AgTNgx8HJvpRghtPAmA8tjZkVYARutEXcdTRSV9/WfMeWbvNE3gi2+EarFm8RU9H
a6ETzaR8pvNcgtqVhDMtn5OrOYltWTNX3H6DJ4kjJwtiQj0qgX4+sA3QWxsMHZBz
4MhTYxIkzBF4kv/saNqmTrlgAWErPjoYjryFcttevcGSDZLKk2iLefzVsQgI2c2H
zJ4F686c58oPqSMCCkxDUnnfPNEtCbX/fucU01Wc5KJ3OQ5QONJDE093Qza/7uM/
aGizymVNOSzidAINBBmoUg3o1b6Gh2a/PFUqiyr5wmqwi4sfT7wv4zXEOraZ+EbT
ck0xErfoOnNRs7sACLGI
=qMZz
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>python</herd>
<upstream>
<maintainer status="active">
<email>mgorny@gentoo.org</email>
<name>Michał Górny</name>
</maintainer>
<bugs-to>https://bitbucket.org/mgorny/python-exec/issues/</bugs-to>
</upstream>
</pkgmetadata>

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/python-exec/python-exec-0.3.1.ebuild,v 1.12 2013/04/14 11:47:51 ago Exp $ # $Header: /var/cvsroot/gentoo-x86/dev-lang/python-exec/python-exec-0.3.1.ebuild,v 1.1 2013/10/30 19:12:16 mgorny Exp $
EAPI=5 EAPI=5
@ -16,9 +16,11 @@ SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2"
LICENSE="BSD" LICENSE="BSD"
SLOT="0" SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="" IUSE=""
RDEPEND="!<dev-python/python-exec-10000"
src_configure() { src_configure() {
local pyimpls i EPYTHON local pyimpls i EPYTHON
for i in "${PYTHON_COMPAT[@]}"; do for i in "${PYTHON_COMPAT[@]}"; do

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/python-exec/python-exec-0.9999.ebuild,v 1.1 2013/09/15 16:50:49 mgorny Exp $ # $Header: /var/cvsroot/gentoo-x86/dev-lang/python-exec/python-exec-0.9999.ebuild,v 1.1 2013/10/30 19:12:16 mgorny Exp $
EAPI=5 EAPI=5
@ -8,7 +8,7 @@ EAPI=5
AUTOTOOLS_AUTORECONF=yes AUTOTOOLS_AUTORECONF=yes
EGIT_REPO_URI="http://bitbucket.org/mgorny/${PN}.git" EGIT_REPO_URI="http://bitbucket.org/mgorny/${PN}.git"
inherit git-2 inherit git-r3
#endif #endif
# Kids, don't do this at home! # Kids, don't do this at home!
@ -23,9 +23,11 @@ SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2"
LICENSE="BSD" LICENSE="BSD"
SLOT="0" SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="" IUSE=""
RDEPEND="!<dev-python/python-exec-10000"
#if LIVE #if LIVE
KEYWORDS= KEYWORDS=
SRC_URI= SRC_URI=

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/python-exec/python-exec-2.0.ebuild,v 1.1 2013/09/17 16:05:41 mgorny Exp $ # $Header: /var/cvsroot/gentoo-x86/dev-lang/python-exec/python-exec-2.0.ebuild,v 1.1 2013/10/30 19:12:16 mgorny Exp $
EAPI=5 EAPI=5
@ -16,9 +16,11 @@ SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2"
LICENSE="BSD" LICENSE="BSD"
SLOT="2" SLOT="2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="" IUSE=""
RDEPEND="!<dev-python/python-exec-10000"
src_configure() { src_configure() {
local pyimpls i EPYTHON local pyimpls i EPYTHON
for i in "${PYTHON_COMPAT[@]}"; do for i in "${PYTHON_COMPAT[@]}"; do

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/python-exec/python-exec-2.9999.ebuild,v 1.1 2013/09/17 16:05:41 mgorny Exp $ # $Header: /var/cvsroot/gentoo-x86/dev-lang/python-exec/python-exec-2.9999.ebuild,v 1.1 2013/10/30 19:12:16 mgorny Exp $
EAPI=5 EAPI=5
@ -9,7 +9,7 @@ AUTOTOOLS_AUTORECONF=yes
EGIT_REPO_URI="http://bitbucket.org/mgorny/${PN}.git" EGIT_REPO_URI="http://bitbucket.org/mgorny/${PN}.git"
EGIT_BRANCH="python-exec2" EGIT_BRANCH="python-exec2"
inherit git-2 inherit git-r3
#endif #endif
# Kids, don't do this at home! # Kids, don't do this at home!
@ -24,9 +24,11 @@ SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2"
LICENSE="BSD" LICENSE="BSD"
SLOT="2" SLOT="2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="" IUSE=""
RDEPEND="!<dev-python/python-exec-10000"
#if LIVE #if LIVE
KEYWORDS= KEYWORDS=
SRC_URI= SRC_URI=

View File

@ -1,6 +1,59 @@
# ChangeLog for dev-python/python-exec # ChangeLog for dev-python/python-exec
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/python-exec/ChangeLog,v 1.51 2013/09/17 16:05:41 mgorny Exp $ # $Header: /var/cvsroot/gentoo-x86/dev-python/python-exec/ChangeLog,v 1.60 2013/10/30 19:13:54 mgorny Exp $
*python-exec-10000.1 (30 Oct 2013)
*python-exec-10000.2 (30 Oct 2013)
30 Oct 2013; Michał Górny <mgorny@gentoo.org> +python-exec-10000.1.ebuild,
+python-exec-10000.2.ebuild, -python-exec-0.3.1.ebuild,
-python-exec-0.9999.ebuild, -python-exec-2.0-r1.ebuild,
-python-exec-2.0-r2.ebuild, -python-exec-2.0-r3.ebuild,
-python-exec-2.9999.ebuild:
Replace dev-python/python-exec with virtual compatibility ebuilds.
*python-exec-2.0-r3 (29 Oct 2013)
*python-exec-2.0-r1 (29 Oct 2013)
29 Oct 2013; Michał Górny <mgorny@gentoo.org> +python-exec-2.0-r1.ebuild,
+python-exec-2.0-r3.ebuild, python-exec-2.0-r2.ebuild,
python-exec-2.9999.ebuild:
Add a temporarily PDEP hack to avoid breaking systems by removing python-
exec:0. Restore old ebuild names to make it possible to propagate it through
dynamic-deps.
*python-exec-2.0-r2 (26 Oct 2013)
26 Oct 2013; Michał Górny <mgorny@gentoo.org> +python-exec-2.0-r2.ebuild,
-python-exec-2.0-r1.ebuild, python-exec-2.9999.ebuild:
Pass "g" option to sed to fix all the occurences of python-exec in dep trees.
19 Oct 2013; Mike Frysinger <vapier@gentoo.org> python-exec-0.3.1.ebuild,
python-exec-0.9999.ebuild, python-exec-2.0-r1.ebuild,
python-exec-2.9999.ebuild:
Add ~m68k love.
17 Oct 2013; Jeroen Roovers <jer@gentoo.org> python-exec-2.0-r1.ebuild:
Stable for HPPA (bug #487676).
14 Oct 2013; Michał Górny <mgorny@gentoo.org> python-exec-0.9999.ebuild,
python-exec-2.9999.ebuild:
Switch to git-r3.
07 Oct 2013; Michał Górny <mgorny@gentoo.org> python-exec-2.0-r1.ebuild,
python-exec-2.9999.ebuild:
Touch vardb after modifications as suggested by Arfrever.
*python-exec-2.0-r1 (03 Oct 2013)
03 Oct 2013; Michał Górny <mgorny@gentoo.org> +python-exec-2.0-r1.ebuild,
-python-exec-2.0.ebuild, python-exec-2.9999.ebuild:
Fix unslotted python-exec deps in vardb when >=python-exec-2.0-r1 is
installed.
29 Sep 2013; Michał Górny <mgorny@gentoo.org> -python-exec-0.2.ebuild,
-python-exec-0.3.ebuild:
Drop old.
*python-exec-2.0 (17 Sep 2013) *python-exec-2.0 (17 Sep 2013)
*python-exec-2.9999 (17 Sep 2013) *python-exec-2.9999 (17 Sep 2013)

View File

@ -1,34 +1,26 @@
-----BEGIN PGP SIGNED MESSAGE----- -----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256 Hash: SHA256
DIST python-exec-0.2.tar.bz2 65466 SHA256 df61ec2968930016dd14d5d1c5f12b5e501bc572bfe07f07e294906070e144fc SHA512 5f66eadedc9acfb915f830d8d8d16c2645d5f22f65fa0bfc9eb0ae77061c51484e07b98edcceb0b0cf6143c246cd3fa8f95b03c89b14e1fb1f0a6951a301d806 WHIRLPOOL 33e797f0bd3a259e8850a054c94c6cb68a32836e02a7a142de11bf8c838e6dab230f368d53fb4928dd62869794ec4ee84ba6c4bbdd0c8a60dce9c83759d23cd0 EBUILD python-exec-10000.1.ebuild 839 SHA256 f368ca422a353887ce64fcef857018f7fd5866dda5bfa286fa67d6d1ff5588cc SHA512 4fcc5bd58dc49c783102b2b8e5d79bf0e6aec346faf074289b0fb5ce9ad5d3ee1e10939521defd1fb2c0b3889a0e8beb7e5cb3a6b540ffc6185a7985150d2809 WHIRLPOOL 3c07bccf7e9219e73c83a1437d15697f7608fcebc2bd66a9b7f5d5c32952088127253d743ac184c2a94cb9f22d0ddfb8dd3c986ed3eb828666bd109a5603a6d4
DIST python-exec-0.3.1.tar.bz2 74441 SHA256 460837775167108419b9497353a6f832fc8a249c341469dd235c70633ac37557 SHA512 764d1aaf3b4f9679be6ab1105b4b4d9222b245502114ee3d451b4507f86679ae05136eeae3337351c80b52ee03b9461a2f89c87e63cc4cbb76a1023fb243f84e WHIRLPOOL 6b34c2f44976a33a67269c766bd13401b6b1b39fad3d5df6bbef2bd06e15e09bd2ac13123718b8fa0bdb67f812c7407192b9c16860ab442d3c35259afeb3da82 EBUILD python-exec-10000.2.ebuild 891 SHA256 f40cc258651a46c5cbd636d7bcf17d39bb526b94208c83f2b40174300eace5b3 SHA512 0eea43ab61a9c49390c0a072436c1fca29f5863d92648858bd66d18db6cd17f4b6a11e654a8c88446d52ba0dd2c3ee843ef979150070c447bebf69e91b25ca96 WHIRLPOOL 0cf7b0c847c576aea3f29c463bf5a2460d35b480081293e56f05896fbf50844f9a99e3c50536b777cd575b1963123a072aef84944003a4003fc603c211981747
DIST python-exec-0.3.tar.bz2 73698 SHA256 3d593d3d06d2a05b90be014577c7d096e30dbe093176cc69c9c7a8deb00c0d7a SHA512 d52497dc81a72550da1c461d8e26fe9640ea02c2b8a8f2437ef4a714a007717d4eaf3508e22569b6693b38caea41934cfc057a398b9d5f5a3cff35c7ad52629a WHIRLPOOL 5b0aaeb20915b9190f648bf552f72842a329c10f1eafcdde3e118ef442a94d309b26462447f1ff42e561a86fb798e5de3478a7c06298f86ca66f5e4699dc1fde MISC ChangeLog 8722 SHA256 bfebbde39e11f451ccc8e555b0ecd561fdba4bd17973b43991e9a6b7cc60e874 SHA512 cc7dbd6230d138ef301058501d9e2581129aa3650e5d7780b11de42be5cb8c9ce152b60d750ea25fac12e55685cb3d90f2fcf47809e84ebff279743f1ae8c761 WHIRLPOOL 578e573280fc9fcbf712b278d9d12149bcc81fb74708d047c522fa218e42a158b5f5319f979c8ac7585626eaffa2ef4a812220250ec4d627fd69630bb3a7bdba
DIST python-exec-2.0.tar.bz2 80777 SHA256 e8a2cf2bbaef012010f23b477d183b17d6021562beff3ede5c7e724a7ee00672 SHA512 ad77f46448461323c15d97f42ebb0a1f44d53397e42a89fdc600dbcc1ccf95a280252011c0b02d71125ca8095bb388d5b3e7e6cb3b93a1cee578a2b1b08b4594 WHIRLPOOL e483fc6eb6d7dd10bbd685c2f3cf9daa0f4165204a2b191c1ae685e8b3e6c7faec929a0bcee647dd94e6b2731f8c1950d0e02334ea8b587aa05cfbe644091367
EBUILD python-exec-0.2.ebuild 1089 SHA256 ee151de72bc789ea1c4e74418fbdb0150b4ae02ed4f96118116fc8f530f4e82c SHA512 2c7c518fb34c0cfc131917571219ddd6f5c6c1b3efd3e78332eaa08f3a57770954f7090d66655c7c02d5a0edfefe90e4debbd615ed05d151aae0ca9d0cbe4143 WHIRLPOOL 70163f1fc2364db548dd7878ff13311911dc7ada81b1e705bcee7b808d963a8371870cb7f29f5cbc133756e4e0fe3a0b6673fa8428643dffa2c9ca7f9cdcd759
EBUILD python-exec-0.3.1.ebuild 1088 SHA256 f76f577167aa049d36d99dfb8975938753c5d9b33c221768757359ebe95a0024 SHA512 97c8077874c8be68cdc619a55c707c69b686c2543cb3761023acfeea4968e38ee193b3634e04742fbb08e336208ee883918a75e3b1caf3d9c1733109ae2cf596 WHIRLPOOL 3a9d900ab1ff8c641744f89c535f953aa593f9dcb7224f5db9ba8a566b48b8450aae1a6a108373c8e3c6c047bfe43a4f761088d6cf2bd4dd28afad3b76526063
EBUILD python-exec-0.3.ebuild 1099 SHA256 75218367b33249e8f4ef01b0e35ef30708a4805e57b6e09ae12a6d44194fcb8a SHA512 e8670571ea319d8301843aab0f4d649a5e7b8b7e04895b7c601b76c46bc66b0ad9d4bd20bc275420c6a200f1b895eabcee8a01fe6bc5ca486e0c5a105b3f5213 WHIRLPOOL d7755b4d1bd9d910e8e16fa97fec6f8c85a089f4753d4dc924e664ecb1b109b66ed87141250230e86852a15b3826c490a4a0a6539979def5bb72a4b743bef8ec
EBUILD python-exec-0.9999.ebuild 1249 SHA256 0eb86834ce4b6cfa0b38544537aad9b13e2a0f7aea3ddedd5183fba927dea36e SHA512 a163ecf33228e6d4f64a44fdcca0f340028ed0e17cc6a511a77d60676a76e3527cf78ed939307fbd4d96fcbc0e17d39be6db7c4371e4cc3d38db6d8e714e63da WHIRLPOOL 50bb7255a75b90431569f0c7afd97497c1b7572e453599c4368f45aa21c8f18d351d0df00b469ce5ad4f3af42ba369fd5eccd668f7009265bc15222c971fefca
EBUILD python-exec-2.0.ebuild 1099 SHA256 ede20f97efae27e67de791d46381e248ae5f527a75db33484fa005da56b3c54e SHA512 ffb165ffda39e924ce742806c1343e22897d33af5c2b7a162bb0fc88260a4701dce3ede014dd2547ad7550f4fc179507465fddbbfbc527f049e50dd0a34c0655 WHIRLPOOL c57ef1d6b74fe444e5e2ccfe9cee5ce9ebb7e9974f0dc7c332f94ee98cd1b09dcd033d28ee92b64b39dfac391a07dbb2096bfd317753ad24bb2788cee6728861
EBUILD python-exec-2.9999.ebuild 1276 SHA256 5445f2e2a1c34e7e2723df540d832a0fe7d92d5ce88a24d89f74f45279fb0026 SHA512 af2dbfef7f8948598dccac64e68a0a41c834fe71a8c078bd39ee7c0af2efbd86298d322b869ba8132a4435e0ff1172fc0c955a7b8ccbd8050c2edadc5f1b2a6a WHIRLPOOL 141a014c0280ee327baa1a641afd56be9eb9051c7fa9f4ab39546916d7df6aee0d71fa0a84d5ed1e1190a08604b5e8b3dec5eabe8b521057f43f738c49792025
MISC ChangeLog 6693 SHA256 68c0d5c0e9de767d9ba60a0e714768afe881ac1be565c32862dfe4a954a1d138 SHA512 faf49d498879829e3e7743e19e4a0649103bcf76a9914ae79edee633811e8cdfe45e3371d8f8e0ab31825652c10ca2210cf2ce35089a0c7bec63f18d971edeec WHIRLPOOL 027a3e44f676561bf8d96a6279ac39df509ba0f315af9d1393823c03ffd670678d8a209fe7eac33ff314ab41caea194bc3b5b52c28f9f94ed7d9477dbb6f2778
MISC metadata.xml 369 SHA256 8b6dcc8bc5a5198e3df4c844ebf07234f8c9eb1ff4e10fa7bccc07a0e5dc7517 SHA512 8cc3738e0fd501a4b374d9e18f5676c78d285549c88061aab63697011f43163275751341dc1199aa9a0e4eb3bc9c8e436df261ede8bcf2f759aab096a53d04e0 WHIRLPOOL c99edc69d860d148ebd3d004131e448a957a1f6a3cb3f32b51e94bed79eee6060e41f0de18edc6dd63b83f507f25ab6f0105e593d7d14b1050106aaa3b45e342 MISC metadata.xml 369 SHA256 8b6dcc8bc5a5198e3df4c844ebf07234f8c9eb1ff4e10fa7bccc07a0e5dc7517 SHA512 8cc3738e0fd501a4b374d9e18f5676c78d285549c88061aab63697011f43163275751341dc1199aa9a0e4eb3bc9c8e436df261ede8bcf2f759aab096a53d04e0 WHIRLPOOL c99edc69d860d148ebd3d004131e448a957a1f6a3cb3f32b51e94bed79eee6060e41f0de18edc6dd63b83f507f25ab6f0105e593d7d14b1050106aaa3b45e342
-----BEGIN PGP SIGNATURE----- -----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.21 (GNU/Linux) Version: GnuPG v2.0.22 (GNU/Linux)
iQJ8BAEBCABmBQJSOH39XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w iQJ8BAEBCABmBQJScVqJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOJAAQAI9A3hbtVgrZ8Qg8FagK7cg+ MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZObV8P+wZ8TvtwXfs58E87nTcVP/sQ
TY4L+LzEthG08stscgsbm/CsUXt35bSfqf5bR29Il83HOSET5sT1YFUYRv7HYZZI hNGpVjgDFqjeV7Ibsu9Nqkk401FS9gu9hAfztWgAF+4qnjlgmXgHTAjihC+BGnyf
D6HLLw4K3RslM2GfBn5pXfeaadOmdwnKvPLgs5hE8LocueVRyAsum7edwQJq5HxP C3ub5soKdMBtTdZCsZ/dCrwl4qJ1vuv6XoSOg1phYy4TLh2q1MQ2PyRjIFtsIaFV
Aio+2PlliRWcCz9K6RV0KV6KRDEBA5mM9QxhDQTaBvXgoGCMTnvk7R7WQFhMk5Ol 4nI5/5Au9EuszrB5aLpEp3am4YDxyC6VG8SVsPD5QKbKxzXcBZgHMHLEKNmEs8IO
UIIvCG5XbNSuHR7JFMYTavyxJhtQ9UylORH/ziBpnxTIBYb9wg8qOZHM88vtVrE4 jnKDRMmaPARkdf5kffbTN14i0b/SOC0emBGIzXgaiRIpceiQnoEki4JRnoKHqUry
PcbmiSBw+XvQqzFSl2rewfB3UdWlSPbRPORs84hCH3tPG0T4zYlxi3QhX1Quhg+1 6wvqJTu2XdT4qfn+7m8FZ79pbzuZyAJAKxqdT10p1gAHtWdRX0mg6P1V6MIT7MaC
bJgvtFK1QN5LvLuX6L8GR0eUP7cBg1ZbxjFazE1DrmEtT9A6UDHPsp/2+0p8xLZc /7e0vgCOQ2krGoEr7Q39Q0ku7skYnRJPaT3rJcNUJcz0yiKfwjcJ8flImoYyIQzl
Tj+lwabFyrsgRZ6ek96Me5+pBsk+Qlv0H3vGna9Yk/s87cCzeN7vHHyWq+cRPZiM 9kc0U0m1KjlyveK+GTjM49GFvhl2Kb0hXK6w26/cbTwnMxRfu3txBnRTCMbp1UXz
XWwoCjnRLeHp5HhUHQTyBGIEnpnz6V7XmTFPnRQ5f8TRn+kmiBe2Cwj7ZZR7XbeZ eCqfenuwmkBtwTkVQDH1taNHxulKpBCi47duylGiJcPnWPF9iQrH9QW9NGmn45M5
mXfnzcwKp7aWXRzMmBb8+aKCEkkU2hTfUUFnbyuc9LDYzQoY+IJ67kkl/kfL0YSK LlRQAIWKrFWwRW/KC4PYKkMYG5lgqXYDeSMdeysyq4faeC49h4QXyCGuSP9n4Ovx
BG4lK7vFo0pSXmRRI9oDJ3qeyTK2ojjxiX6mM7qUQ2iK6I+oxc++aDuEVixE4bVC TjkoVnQNI3O5WyrzfMESTYhCVECYGWdT1zBtG4a2tclchZKHZuaL9oQgsBDXXdW6
M1mJhYGfkGMc5njrk7Lh 9xhwQIF6G3E7/O+1i2an
=yQgY =NqFS
-----END PGP SIGNATURE----- -----END PGP SIGNATURE-----

View File

@ -1,35 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/python-exec/python-exec-0.2.ebuild,v 1.16 2013/02/26 18:36:57 mgorny Exp $
EAPI=5
# Kids, don't do this at home!
inherit python-utils-r1
PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" )
inherit autotools-utils python-r1
DESCRIPTION="Python script wrapper"
HOMEPAGE="https://bitbucket.org/mgorny/python-exec/"
SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
src_configure() {
local pyimpls i EPYTHON
for i in "${PYTHON_COMPAT[@]}"; do
python_export "${i}" EPYTHON
pyimpls+=" ${EPYTHON}"
done
local myeconfargs=(
--with-eprefix="${EPREFIX}"
--with-python-impls="${pyimpls}"
)
autotools-utils_src_configure
}

View File

@ -1,35 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/python-exec/python-exec-0.3.ebuild,v 1.2 2013/02/26 18:36:57 mgorny Exp $
EAPI=5
# Kids, don't do this at home!
inherit python-utils-r1
PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" )
inherit autotools-utils python-r1
DESCRIPTION="Python script wrapper"
HOMEPAGE="https://bitbucket.org/mgorny/python-exec/"
SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
src_configure() {
local pyimpls i EPYTHON
for i in "${PYTHON_COMPAT[@]}"; do
python_export "${i}" EPYTHON
pyimpls+=" ${EPYTHON}"
done
local myeconfargs=(
--with-eprefix="${EPREFIX}"
--with-python-impls="${pyimpls}"
)
autotools-utils_src_configure
}

View File

@ -0,0 +1,22 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/python-exec/python-exec-10000.1.ebuild,v 1.1 2013/10/30 19:13:54 mgorny Exp $
EAPI=5
# Kids, don't do this at home!
inherit python-utils-r1
PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" )
inherit python-r1
DESCRIPTION="Compatibility package for dev-lang/python-exec"
HOMEPAGE="https://bitbucket.org/mgorny/python-exec/"
SRC_URI=""
LICENSE="BSD"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="dev-lang/python-exec:0[${PYTHON_USEDEP}]"

View File

@ -0,0 +1,23 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/python-exec/python-exec-10000.2.ebuild,v 1.1 2013/10/30 19:13:54 mgorny Exp $
EAPI=5
# Kids, don't do this at home!
inherit python-utils-r1
PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" )
inherit python-r1
DESCRIPTION="Compatibility package for dev-lang/python-exec"
HOMEPAGE="https://bitbucket.org/mgorny/python-exec/"
SRC_URI=""
LICENSE="BSD"
SLOT="2"
KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="dev-lang/python-exec:0[${PYTHON_USEDEP}]
dev-lang/python-exec:2[${PYTHON_USEDEP}]"

View File

@ -1,6 +1,259 @@
# ChangeLog for eclass directory # ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.973 2013/09/17 17:33:39 mgorny Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1048 2013/11/05 05:21:30 dirtyepic Exp $
05 Nov 2013; Ryan Hill <dirtyepic@gentoo.org> toolchain.eclass:
Update for libmudflap removal.
04 Nov 2013; Mike Gilbert <floppym@gentoo.org> mercurial.eclass:
Initialize cert_opt to an empty array instead of an empty string. Reported by
Kristian Fiskerstrand.
04 Nov 2013; Ulrich Müller <ulm@gentoo.org> elisp-common.eclass:
Don't create site-gentoo.el in postrm phase.
03 Nov 2013; Michał Górny <mgorny@gentoo.org> tests/python-utils-r1.sh:
Fix python-utils-r1 tests to accomodate versions in PYTHON_PKG_DEP.
02 Nov 2013; Tom Wijsman <TomWij@gentoo.org> kernel-2.eclass:
Trivial change to support patches with pre-defined patch levels.
02 Nov 2013; Ryan Hill <dirtyepic@gentoo.org> flag-o-matic.eclass:
Add -fno-builtin* to ALLOWED_FLAGS - requested by Justin Vrooman.
02 Nov 2013; Ryan Hill <dirtyepic@gentoo.org> tests/flag-o-matic.sh:
Account for leading whitespace in append-cflags tests.
30 Oct 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
Fix parallel checkout race conditions, bug #489280.
30 Oct 2013; Michał Górny <mgorny@gentoo.org> python-r1.eclass,
python-single-r1.eclass, python-utils-r1.eclass:
Switch the eclasses to use dev-lang/python-exec.
27 Oct 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
Create a fake ".git" directory inside the checkout to satisfy git rev-parse
uses in build systems. Bug #489100.
27 Oct 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
Strip sub-slot from local repo IDs.
27 Oct 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
Remove deprecated functions.
27 Oct 2013; Michał Górny <mgorny@gentoo.org> flag-o-matic.eclass:
Consider -frecord-gcc-switches a safe flag and do not strip it with
strip-flags.
26 Oct 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
Fix distutils-r1_python_install to strip --install-scripts= rather than
passing "install" twice to override it. Fixes compatibility with
dev-python/paver.
26 Oct 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
Fix handling relative submodule paths.
22 Oct 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
Fix failing to pass default install arguments when user passes an additional
command. Reported by radhermit.
22 Oct 2013; Michał Górny <mgorny@gentoo.org> python-any-r1.eclass,
python-r1.eclass, python-single-r1.eclass:
Introduce a "common" python_setup function to set up Python for use in outer
scope.
22 Oct 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
Support installing Python scripts with custom --install-scripts argument. Bug
#487788.
22 Oct 2013; Michał Górny <mgorny@gentoo.org> systemd.eclass:
Add systemd_enable_ntpunit wrt bug #458132.
20 Oct 2013; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
Updates from qt overlay: drop USE="c++0x" from 4.8.5 and later versions; warn
on downgrade instead of dying.
20 Oct 2013; Julian Ospald <hasufell@gentoo.org> multilib-minimal.eclass:
make doc installation part of default multilib_src_install_all() wrt #483304
17 Oct 2013; Christoph Junghans <ottxor@gentoo.org> subversion.eclass:
added prefix support (bug #485534)
15 Oct 2013; Ryan Hill <dirtyepic@gentoo.org> toolchain.eclass:
Remove .la files for libasan and libtsan. They reference non-existent
libstdc++.la when fixlafiles is disabled/unsupported, and -fsanitize doesn't
work with -static anyways. (bug #487550)
14 Oct 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
Fix over-use of ||die.
14 Oct 2013; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
Add qtbearer to nolibx11_pkgs
14 Oct 2013; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
Switch to git-r3.eclass
14 Oct 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
Add missing "die" calls as reported by Nikoli.
13 Oct 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
Respect EVCS_OFFLINE in git-r3_fetch.
12 Oct 2013; Jeroen Roovers <jer@gentoo.org> nvidia-driver.eclass:
Use readme.gentoo.eclass (bug #457594).
12 Oct 2013; Michał Górny <mgorny@gentoo.org> python-any-r1.eclass:
Do not look up Python for binary package install.
10 Oct 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
Do not alter HOME and TMPDIR when single impl is being used. This may
work-around bug #487260.
09 Oct 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
Fix pypy dependency.
09 Oct 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
Bump dependencies on Python interpreters to require newest stable versions.
Bug #463532.
09 Oct 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
Skip submodules that have update=none specified in config. Fixes bug #487262.
08 Oct 2013; Michał Górny <mgorny@gentoo.org> git-2.eclass, git-r3.eclass:
Fix git-r3 -> git-2 dependency leak, as noted in bug #487026.
08 Oct 2013; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
Remove deprecated autotools-utils_autoreconf.
07 Oct 2013; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
small modification on output from function dev_check
06 Oct 2013; Vlastimil Babka <caster@gentoo.org> java-utils-2.eclass:
Convert comments for eclass manpages. Heavily based on work from ercpe, bug
#476946.
05 Oct 2013; Michał Górny <mgorny@gentoo.org> -git.eclass:
Remove lastrited git.eclass.
05 Oct 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
Add missing git DEPEND wrt bug #487026.
05 Oct 2013; Vlastimil Babka <caster@gentoo.org> java-ant-2.eclass:
Convert comments for eclass manpages. Heavily based on work from ercpe, bug
#476946.
05 Oct 2013; Vlastimil Babka <caster@gentoo.org> ant-tasks.eclass:
Convert comments for eclass manpages. Almost completely based on work from
'mren <bugs@rennings.net>' in bug #210723 and ercpe from bug #476946.
04 Oct 2013; Alexandre Rostovtsev <tetromino@gentoo.org> vala.eclass:
Prepare for vala-0.22
04 Oct 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
enlightenment.eclass:
No stable keywords for mips
01 Oct 2013; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
Clean up the splitting code wrt suggestions from Ulrich Mueller.
01 Oct 2013; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
Split ABIs without altering IFS, to work-around bug in Paludis, bug #486592.
30 Sep 2013; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
Fix duplicate flags in MULTILIB_USEDEP. Thanks for the report and the patch
to Ulrich Mueller.
30 Sep 2013; Christoph Junghans <ottxor@gentoo.org>
toolchain-binutils.eclass:
add prefix support
29 Sep 2013; Christoph Junghans <ottxor@gentoo.org> intel-sdp.eclass:
EAPI bump, ccache support
29 Sep 2013; Gilles Dartiguelongue <eva@gentoo.org> gst-plugins10.eclass:
Add support for gstreamer 1.2 release series.
29 Sep 2013; Michał Górny <mgorny@gentoo.org> python-distutils-ng.eclass:
Last rite python-distutils-ng.
29 Sep 2013; Pacho Ramos <pacho@gentoo.org> gnome2.eclass:
Use einstalldocs (#484876)
28 Sep 2013; Mike Gilbert <floppym@gentoo.org> distutils-r1.eclass:
Truncate .pydistutils.cfg in case we call distutils-r1_python_compile more
than once.
28 Sep 2013; Christoph Junghans <ottxor@gentoo.org> cvs.eclass:
added prefix support
27 Sep 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
Use pydistutils.cfg to set build-dirs instead of passing commands explicitly.
This should reduce the amount of implicit behavior.
27 Sep 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
Make HOME per-implementation.
27 Sep 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
Always fetch all branches when doing non-shallow fetch.
26 Sep 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
Fix parsing EGIT_REPO_URI. Bug #486080.
26 Sep 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
Update doc on EGIT_NONSHALLOW.
26 Sep 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
Wrap symlinks installed to PYTHON_SCRIPTDIR as well.
26 Sep 2013; Michał Górny <mgorny@gentoo.org> python-r1.eclass,
python-single-r1.eclass, python-utils-r1.eclass:
Fix EAPI=4 on python-exec:2 since that is what pkgcore will require (the only
EAPI=4 consumer right now).
25 Sep 2013; Christoph Junghans <ottxor@gentoo.org> texlive-module.eclass:
Require EAPI>=2, add prefix support
25 Sep 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
Support EGIT_REPO_URI being an array. This is needed for tests.
25 Sep 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
Update git URI stripping for gnome.org.
24 Sep 2013; Michał Górny <mgorny@gentoo.org> python-any-r1.eclass:
Introduce python_gen_any_dep to generate any-of dependencies matching
python_check_deps() code.
24 Sep 2013; Maxim Koltsov <maksbotan@gentoo.org> leechcraft.eclass:
Correct official mirror url in SRC_URI.
21 Sep 2013; Christoph Junghans <ottxor@gentoo.org> alternatives.eclass:
added prefix support
19 Sep 2013; Christoph Junghans <ottxor@gentoo.org> distutils-r1.eclass:
Fixed prefix qa
19 Sep 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
Strip trailing slashes from repo URI when determining local copy directory.
19 Sep 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
Do not even create shallow repository when EGIT_NONSHALLOW is set. Otherwise,
the eclass tries to unshallow it and that breaks broken git servers like
Google Code.
18 Sep 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
Fix accepting arguments in distutils_install_for_testing.
18 Sep 2013; Michał Górny <mgorny@gentoo.org> python.eclass:
Add a note not to add new Python versions to python.eclass.
18 Sep 2013; Sergey Popov <pinkbyte@gentoo.org> leechcraft.eclass:
Add official mirror to LeechCraft SRC_URI, thanks to 0xd34df00d
18 Sep 2013; Michał Górny <mgorny@gentoo.org> multibuild.eclass:
Fix coreutils dep to be build-time.
17 Sep 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
Fix missing variable replacement in _python_ln_rel.
17 Sep 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass: 17 Sep 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
Use einstalldocs. Use einstalldocs.

View File

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/alternatives.eclass,v 1.17 2011/08/22 04:46:31 vapier Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/alternatives.eclass,v 1.18 2013/09/21 01:03:42 ottxor Exp $
# @ECLASS: alternatives.eclass # @ECLASS: alternatives.eclass
# @AUTHOR: # @AUTHOR:
@ -53,6 +53,7 @@
# @DESCRIPTION: # @DESCRIPTION:
# automatic deduction based on a symlink and a regex mask # automatic deduction based on a symlink and a regex mask
alternatives_auto_makesym() { alternatives_auto_makesym() {
has "${EAPI:-0}" 0 1 2 && ! use prefix && EROOT="${ROOT}"
local SYMLINK REGEX ALT myregex local SYMLINK REGEX ALT myregex
SYMLINK=$1 SYMLINK=$1
REGEX=$2 REGEX=$2
@ -67,20 +68,22 @@ alternatives_auto_makesym() {
# sort a space delimited string by converting it to a multiline list # sort a space delimited string by converting it to a multiline list
# and then run sort -r over it. # and then run sort -r over it.
# make sure we use ${ROOT} because otherwise stage-building will break # make sure we use ${EROOT} because otherwise stage-building will break
ALT="$(for i in $(echo ${ROOT}${myregex}); do echo ${i#${ROOT}}; done | sort -r)" ALT="$(for i in $(echo ${EROOT}${myregex}); do echo ${i#${EROOT}}; done | sort -r)"
alternatives_makesym ${SYMLINK} ${ALT} alternatives_makesym ${SYMLINK} ${ALT}
} }
alternatives_makesym() { alternatives_makesym() {
has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
local ALTERNATIVES="" local ALTERNATIVES=""
local SYMLINK="" local SYMLINK=""
local alt pref local alt pref
# usage: alternatives_makesym <resulting symlink> [alternative targets..] # usage: alternatives_makesym <resulting symlink> [alternative targets..]
SYMLINK=$1 # make sure it is in the prefix, allow it already to be in the prefix
SYMLINK=${EPREFIX}/${1#${EPREFIX}}
# this trick removes the trailing / from ${ROOT} # this trick removes the trailing / from ${ROOT}
pref=$(echo ${ROOT} | sed 's:/$::') pref=${ROOT%/}
shift shift
ALTERNATIVES=$@ ALTERNATIVES=$@
@ -88,6 +91,7 @@ alternatives_makesym() {
# and if one exists, link it and finish. # and if one exists, link it and finish.
for alt in ${ALTERNATIVES}; do for alt in ${ALTERNATIVES}; do
alt=${EPREFIX}/${alt#${EPREFIX}}
if [ -f "${pref}${alt}" ]; then if [ -f "${pref}${alt}" ]; then
#are files in same directory? #are files in same directory?
if [ "${alt%/*}" = "${SYMLINK%/*}" ] if [ "${alt%/*}" = "${SYMLINK%/*}" ]

View File

@ -3,7 +3,18 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or later # Distributed under the terms of the GNU General Public License, v2 or later
# Author Vlastimil Babka <caster@gentoo.org> # Author Vlastimil Babka <caster@gentoo.org>
# $Header: /var/cvsroot/gentoo-x86/eclass/ant-tasks.eclass,v 1.15 2013/08/28 21:28:33 tomwij Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/ant-tasks.eclass,v 1.16 2013/10/05 12:07:01 caster Exp $
# @ECLASS: ant-tasks.eclass
# @MAINTAINER:
# java@gentoo.org
# @AUTHOR:
# Vlastimil Babka <caster@gentoo.org>
# @BLURB: Eclass for building dev-java/ant-* packages
# @DESCRIPTION:
# This eclass provides functionality and default ebuild variables for building
# dev-java/ant-* packages easily.
# we set ant-core dep ourselves, restricted # we set ant-core dep ourselves, restricted
JAVA_ANT_DISABLE_ANT_CORE_DEP=true JAVA_ANT_DISABLE_ANT_CORE_DEP=true
@ -13,65 +24,39 @@ inherit versionator java-pkg-2 java-ant-2
EXPORT_FUNCTIONS src_unpack src_compile src_install EXPORT_FUNCTIONS src_unpack src_compile src_install
# ----------------------------------------------------------------------------- # @ECLASS-VARIABLE: ANT_TASK_JDKVER
# @eclass-begin # @DESCRIPTION:
# @eclass-shortdesc Eclass for building dev-java/ant-* packages
# @eclass-maintainer java@gentoo.org
#
# This eclass provides functionality and default ebuild variables for building
# dev-java/ant-* packages easily.
#
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
# @variable-preinherit ANT_TASK_JDKVER
# @variable-default 1.5
#
# Affects the >=virtual/jdk version set in DEPEND string. Defaults to 1.5, can # Affects the >=virtual/jdk version set in DEPEND string. Defaults to 1.5, can
# be overriden from ebuild BEFORE inheriting this eclass. # be overriden from ebuild BEFORE inheriting this eclass.
# -----------------------------------------------------------------------------
ANT_TASK_JDKVER=${ANT_TASK_JDKVER-1.5} ANT_TASK_JDKVER=${ANT_TASK_JDKVER-1.5}
# ----------------------------------------------------------------------------- # @ECLASS-VARIABLE: ANT_TASK_JREVER
# @variable-preinherit ANT_TASK_JREVER # @DESCRIPTION:
# @variable-default 1.5
#
# Affects the >=virtual/jre version set in DEPEND string. Defaults to 1.5, can # Affects the >=virtual/jre version set in DEPEND string. Defaults to 1.5, can
# be overriden from ebuild BEFORE inheriting this eclass. # be overriden from ebuild BEFORE inheriting this eclass.
# -----------------------------------------------------------------------------
ANT_TASK_JREVER=${ANT_TASK_JREVER-1.5} ANT_TASK_JREVER=${ANT_TASK_JREVER-1.5}
# ----------------------------------------------------------------------------- # @ECLASS-VARIABLE: ANT_TASK_NAME
# @variable-internal ANT_TASK_NAME # @DESCRIPTION:
# @variable-default the rest of $PN after "ant-" # The name of this ant task as recognized by ant's build.xml, derived from $PN
# # by removing the ant- prefix. Read-only.
# The name of this ant task as recognized by ant's build.xml, derived from $PN.
# -----------------------------------------------------------------------------
ANT_TASK_NAME="${PN#ant-}" ANT_TASK_NAME="${PN#ant-}"
# ----------------------------------------------------------------------------- # @ECLASS-VARIABLE: ANT_TASK_DEPNAME
# @variable-preinherit ANT_TASK_DEPNAME # @DESCRIPTION:
# @variable-default $ANT_TASK_NAME
#
# Specifies JAVA_PKG_NAME (PN{-SLOT} used with java-pkg_jar-from) of the package # Specifies JAVA_PKG_NAME (PN{-SLOT} used with java-pkg_jar-from) of the package
# that this one depends on. Defaults to the name of ant task, ebuild can # that this one depends on. Defaults to the name of ant task, ebuild can
# override it before inheriting this eclass. # override it before inheriting this eclass.
# -----------------------------------------------------------------------------
ANT_TASK_DEPNAME=${ANT_TASK_DEPNAME-${ANT_TASK_NAME}} ANT_TASK_DEPNAME=${ANT_TASK_DEPNAME-${ANT_TASK_NAME}}
# ----------------------------------------------------------------------------- # @ECLASS-VARIABLE: ANT_TASK_DISABLE_VM_DEPS
# @variable-preinherit ANT_TASK_DISABLE_VM_DEPS # @DEFAULT_UNSET
# @variable-default unset # @DESCRIPTION:
#
# If set, no JDK/JRE deps are added. # If set, no JDK/JRE deps are added.
# -----------------------------------------------------------------------------
# ----------------------------------------------------------------------------- # @VARIABLE: ANT_TASK_PV
# @variable-internal ANT_TASK_PV # @INTERNAL
# @variable-default Just the number in $PV without any beta/RC suffixes
#
# Version of ant-core this task is intended to register and thus load with. # Version of ant-core this task is intended to register and thus load with.
# -----------------------------------------------------------------------------
ANT_TASK_PV="${PV}" ANT_TASK_PV="${PV}"
# special care for beta/RC releases # special care for beta/RC releases
@ -105,9 +90,7 @@ fi
# source/workdir name # source/workdir name
MY_P="apache-ant-${MY_PV}" MY_P="apache-ant-${MY_PV}"
# -----------------------------------------------------------------------------
# Default values for standard ebuild variables, can be overriden from ebuild. # Default values for standard ebuild variables, can be overriden from ebuild.
# -----------------------------------------------------------------------------
DESCRIPTION="Apache Ant's optional tasks depending on ${ANT_TASK_DEPNAME}" DESCRIPTION="Apache Ant's optional tasks depending on ${ANT_TASK_DEPNAME}"
HOMEPAGE="http://ant.apache.org/" HOMEPAGE="http://ant.apache.org/"
SRC_URI="${UPSTREAM_PREFIX}/${MY_P}-src.tar.bz2 SRC_URI="${UPSTREAM_PREFIX}/${MY_P}-src.tar.bz2
@ -133,14 +116,15 @@ RESTRICT="test"
S="${WORKDIR}/${MY_P}" S="${WORKDIR}/${MY_P}"
# ------------------------------------------------------------------------------ # @FUNCTION: ant-tasks_src_unpack
# @eclass-src_unpack # @USAGE: [ base ] [ jar-dep ] [ all ]
# @DESCRIPTION:
# The function Is split into two parts, defaults to both of them ('all').
# #
# Is split into two parts, defaults to both of them ('all').
# base: performs the unpack, build.xml replacement and symlinks ant.jar from # base: performs the unpack, build.xml replacement and symlinks ant.jar from
# ant-core # ant-core
#
# jar-dep: symlinks the jar file(s) from dependency package # jar-dep: symlinks the jar file(s) from dependency package
# ------------------------------------------------------------------------------
ant-tasks_src_unpack() { ant-tasks_src_unpack() {
[[ -z "${1}" ]] && ant-tasks_src_unpack all [[ -z "${1}" ]] && ant-tasks_src_unpack all
@ -172,22 +156,18 @@ ant-tasks_src_unpack() {
} }
# ------------------------------------------------------------------------------ # @FUNCTION: ant-tasks_src_compile
# @eclass-src_compile # @DESCRIPTION:
#
# Compiles the jar with installed ant-core. # Compiles the jar with installed ant-core.
# ------------------------------------------------------------------------------
ant-tasks_src_compile() { ant-tasks_src_compile() {
ANT_TASKS="none" eant -Dbuild.dep=${ANT_TASK_NAME} jar-dep ANT_TASKS="none" eant -Dbuild.dep=${ANT_TASK_NAME} jar-dep
} }
# ------------------------------------------------------------------------------ # @FUNCTION: ant-tasks_src_install
# @eclass-src_install # @DESCRIPTION:
#
# Installs the jar and registers its presence for the ant launcher script. # Installs the jar and registers its presence for the ant launcher script.
# Version param ensures it won't get loaded (thus break) when ant-core is # Version param ensures it won't get loaded (thus break) when ant-core is
# updated to newer version. # updated to newer version.
# ------------------------------------------------------------------------------
ant-tasks_src_install() { ant-tasks_src_install() {
java-pkg_dojar build/lib/${PN}.jar java-pkg_dojar build/lib/${PN}.jar
java-pkg_register-ant-task --version "${ANT_TASK_PV}" java-pkg_register-ant-task --version "${ANT_TASK_PV}"

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.70 2013/06/29 08:17:06 mgorny Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.71 2013/10/08 10:34:45 mgorny Exp $
# @ECLASS: autotools-utils.eclass # @ECLASS: autotools-utils.eclass
# @MAINTAINER: # @MAINTAINER:
@ -292,84 +292,6 @@ remove_libtool_files() {
done done
} }
# @FUNCTION: autotools-utils_autoreconf
# @DESCRIPTION:
# Reconfigure the sources (like gnome-autogen.sh or eautoreconf).
autotools-utils_autoreconf() {
debug-print-function ${FUNCNAME} "$@"
eqawarn "The autotools-utils_autoreconf() function was deprecated."
eqawarn "Please call autotools-utils_src_prepare()"
eqawarn "with AUTOTOOLS_AUTORECONF set instead."
# Override this func to not require unnecessary eaclocal calls.
autotools_check_macro() {
local x
# Add a few additional variants as we don't get expansions.
[[ ${1} = AC_CONFIG_HEADERS ]] && set -- "${@}" \
AC_CONFIG_HEADER AM_CONFIG_HEADER
for x; do
grep -h "^${x}" configure.{ac,in} 2>/dev/null
done
}
einfo "Autoreconfiguring '${PWD}' ..."
local auxdir=$(sed -n -e 's/^AC_CONFIG_AUX_DIR(\(.*\))$/\1/p' \
configure.{ac,in} 2>/dev/null)
if [[ ${auxdir} ]]; then
auxdir=${auxdir%%]}
mkdir -p ${auxdir##[}
fi
# Support running additional tools like gnome-autogen.sh.
# Note: you need to add additional depends to the ebuild.
# gettext
if [[ $(autotools_check_macro AM_GLIB_GNU_GETTEXT) ]]; then
echo 'no' | autotools_run_tool glib-gettextize --copy --force
elif [[ $(autotools_check_macro AM_GNU_GETTEXT) ]]; then
eautopoint --force
fi
# intltool
if [[ $(autotools_check_macro AC_PROG_INTLTOOL IT_PROG_INTLTOOL) ]]
then
autotools_run_tool intltoolize --copy --automake --force
fi
# gtk-doc
if [[ $(autotools_check_macro GTK_DOC_CHECK) ]]; then
autotools_run_tool gtkdocize --copy
fi
# gnome-doc
if [[ $(autotools_check_macro GNOME_DOC_INIT) ]]; then
autotools_run_tool gnome-doc-prepare --copy --force
fi
if [[ $(autotools_check_macro AC_PROG_LIBTOOL AM_PROG_LIBTOOL LT_INIT) ]]
then
_elibtoolize --copy --force --install
fi
eaclocal
eautoconf
eautoheader
FROM_EAUTORECONF=sure eautomake
local x
for x in $(autotools_check_macro_val AC_CONFIG_SUBDIRS); do
if [[ -d ${x} ]] ; then
pushd "${x}" >/dev/null || die
autotools-utils_autoreconf
popd >/dev/null || die
fi
done
}
# @FUNCTION: autotools-utils_src_prepare # @FUNCTION: autotools-utils_src_prepare
# @DESCRIPTION: # @DESCRIPTION:
# The src_prepare function. # The src_prepare function.

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.82 2013/06/18 04:31:44 ottxor Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.83 2013/09/28 16:22:29 ottxor Exp $
# @ECLASS: cvs.eclass # @ECLASS: cvs.eclass
# @MAINTAINER: # @MAINTAINER:
@ -202,6 +202,7 @@ fi
# called from cvs_src_unpack # called from cvs_src_unpack
cvs_fetch() { cvs_fetch() {
has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
# Make these options local variables so that the global values are # Make these options local variables so that the global values are
# not affected by modifications in this function. # not affected by modifications in this function.
@ -392,7 +393,7 @@ cvs_fetch() {
export CVS_RSH="${T}/cvs_sshwrapper" export CVS_RSH="${T}/cvs_sshwrapper"
cat > "${CVS_RSH}"<<EOF cat > "${CVS_RSH}"<<EOF
#!/usr/bin/python #!${EPREFIX}/usr/bin/python
import fcntl import fcntl
import os import os
import sys import sys
@ -436,7 +437,7 @@ EOF
>> "${CVS_RSH}" >> "${CVS_RSH}"
echo "${CVS_ECLASS_STRICT_HOST_CHECKING}')" \ echo "${CVS_ECLASS_STRICT_HOST_CHECKING}')" \
>> "${CVS_RSH}" >> "${CVS_RSH}"
echo "os.execv('/usr/bin/ssh', newarglist)" \ echo "os.execv('${EPREFIX}/usr/bin/ssh', newarglist)" \
>> "${CVS_RSH}" >> "${CVS_RSH}"
chmod a+x "${CVS_RSH}" chmod a+x "${CVS_RSH}"

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.80 2013/09/17 17:33:39 mgorny Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.90 2013/10/26 17:47:51 mgorny Exp $
# @ECLASS: distutils-r1 # @ECLASS: distutils-r1
# @MAINTAINER: # @MAINTAINER:
@ -215,45 +215,13 @@ fi
# #
# setup.py will be passed the following, in order: # setup.py will be passed the following, in order:
# 1. ${mydistutilsargs[@]} # 1. ${mydistutilsargs[@]}
# 2. The 'build' command and standard build options including ${BUILD_DIR} # 2. additional arguments passed to the esetup.py function.
# 3. Any additional arguments passed to the esetup.py function.
# #
# This command dies on failure. # This command dies on failure.
esetup.py() { esetup.py() {
debug-print-function ${FUNCNAME} "${@}" debug-print-function ${FUNCNAME} "${@}"
local add_args=() set -- "${PYTHON:-python}" setup.py "${mydistutilsargs[@]}" "${@}"
if [[ ${BUILD_DIR} ]]; then
add_args+=(
build
--build-base "${BUILD_DIR}"
# using a single directory for them helps us export
# ${PYTHONPATH} and ebuilds find the sources independently
# of whether the package installs extensions or not
#
# note: due to some packages (wxpython) relying on separate
# platlib & purelib dirs, we do not set --build-lib (which
# can not be overriden with --build-*lib)
--build-platlib "${BUILD_DIR}/lib"
--build-purelib "${BUILD_DIR}/lib"
# make the ebuild writer lives easier
--build-scripts "${BUILD_DIR}/scripts"
)
# if setuptools is used, adjust egg_info path as well
if "${PYTHON:-python}" setup.py --help egg_info &>/dev/null; then
add_args+=(
egg_info --egg-base "${BUILD_DIR}"
)
fi
elif [[ ! ${DISTUTILS_IN_SOURCE_BUILD} ]]; then
die 'Out-of-source build requested, yet BUILD_DIR unset.'
fi
set -- "${PYTHON:-python}" setup.py \
"${mydistutilsargs[@]}" "${add_args[@]}" "${@}"
echo "${@}" >&2 echo "${@}" >&2
"${@}" || die "${@}" || die
@ -305,7 +273,7 @@ distutils_install_for_testing() {
fi fi
mkdir -p "${libdir}" || die mkdir -p "${libdir}" || die
esetup.py "${add_args[@]}" esetup.py "${add_args[@]}" "${@}"
} }
# @FUNCTION: _distutils-r1_disable_ez_setup # @FUNCTION: _distutils-r1_disable_ez_setup
@ -323,18 +291,6 @@ _distutils-r1_disable_ez_setup() {
fi fi
} }
# @FUNCTION: _distutils-r1_copy_egg_info
# @INTERNAL
# @DESCRIPTION:
# Copy egg-info files to the ${BUILD_DIR} (that's going to become
# egg-base in esetup.py). This way, we respect whatever's in upstream
# egg-info.
_distutils-r1_copy_egg_info() {
mkdir -p "${BUILD_DIR}" || die
# stupid freebsd can't do 'cp -t ${BUILD_DIR} {} +'
find -name '*.egg-info' -type d -exec cp -pr {} "${BUILD_DIR}"/ ';' || die
}
# @FUNCTION: distutils-r1_python_prepare_all # @FUNCTION: distutils-r1_python_prepare_all
# @DESCRIPTION: # @DESCRIPTION:
# The default python_prepare_all(). It applies the patches from PATCHES # The default python_prepare_all(). It applies the patches from PATCHES
@ -386,6 +342,46 @@ distutils-r1_python_configure() {
: :
} }
# @FUNCTION: _distutils-r1_create_setup_cfg
# @INTERNAL
# @DESCRIPTION:
# Create implementation-specific configuration file for distutils,
# setting proper build-dir paths.
_distutils-r1_create_setup_cfg() {
cat > "${HOME}"/.pydistutils.cfg <<-_EOF_ || die
[build]
build-base = ${BUILD_DIR}
# using a single directory for them helps us export
# ${PYTHONPATH} and ebuilds find the sources independently
# of whether the package installs extensions or not
#
# note: due to some packages (wxpython) relying on separate
# platlib & purelib dirs, we do not set --build-lib (which
# can not be overriden with --build-*lib)
build-platlib = %(build-base)s/lib
build-purelib = %(build-base)s/lib
# make the ebuild writer lives easier
build-scripts = %(build-base)s/scripts
[egg_info]
egg-base = ${BUILD_DIR}
_EOF_
}
# @FUNCTION: _distutils-r1_copy_egg_info
# @INTERNAL
# @DESCRIPTION:
# Copy egg-info files to the ${BUILD_DIR} (that's going to become
# egg-base in esetup.py). This way, we respect whatever's in upstream
# egg-info.
_distutils-r1_copy_egg_info() {
mkdir -p "${BUILD_DIR}" || die
# stupid freebsd can't do 'cp -t ${BUILD_DIR} {} +'
find -name '*.egg-info' -type d -exec cp -pr {} "${BUILD_DIR}"/ ';' || die
}
# @FUNCTION: distutils-r1_python_compile # @FUNCTION: distutils-r1_python_compile
# @USAGE: [additional-args...] # @USAGE: [additional-args...]
# @DESCRIPTION: # @DESCRIPTION:
@ -395,9 +391,10 @@ distutils-r1_python_configure() {
distutils-r1_python_compile() { distutils-r1_python_compile() {
debug-print-function ${FUNCNAME} "${@}" debug-print-function ${FUNCNAME} "${@}"
_distutils-r1_create_setup_cfg
_distutils-r1_copy_egg_info _distutils-r1_copy_egg_info
esetup.py "${@}" esetup.py build "${@}"
} }
# @FUNCTION: distutils-r1_python_test # @FUNCTION: distutils-r1_python_test
@ -410,26 +407,29 @@ distutils-r1_python_test() {
} }
# @FUNCTION: _distutils-r1_wrap_scripts # @FUNCTION: _distutils-r1_wrap_scripts
# @USAGE: <path> # @USAGE: <path> <bindir>
# @INTERNAL # @INTERNAL
# @DESCRIPTION: # @DESCRIPTION:
# Moves and wraps all installed scripts/executables as necessary. # Moves and wraps all installed scripts/executables as necessary.
_distutils-r1_wrap_scripts() { _distutils-r1_wrap_scripts() {
debug-print-function ${FUNCNAME} "${@}" debug-print-function ${FUNCNAME} "${@}"
[[ ${#} -eq 2 ]] || die "usage: ${FUNCNAME} <path> <bindir>"
local path=${1} local path=${1}
[[ ${path} ]] || die "${FUNCNAME}: no path given" local bindir=${2}
if ! _python_want_python_exec2; then if ! _python_want_python_exec2; then
local PYTHON_SCRIPTDIR=${EPREFIX}/usr/bin local PYTHON_SCRIPTDIR=${bindir}
fi fi
mkdir -p "${path}/usr/bin" || die
local f local f
while IFS= read -r -d '' f; do while IFS= read -r -d '' f; do
local basename=${f##*/} local basename=${f##*/}
debug-print "${FUNCNAME}: found executable at ${f#${path}/}" debug-print "${FUNCNAME}: found executable at ${f#${path}/}"
[[ -d ${f} ]] && die "Unexpected directory: ${f}"
mkdir -p "${path}${bindir}" || die
local shebang local shebang
read -r shebang < "${f}" read -r shebang < "${f}"
if [[ ${shebang} == '#!'*${EPYTHON}* ]]; then if [[ ${shebang} == '#!'*${EPYTHON}* ]]; then
@ -441,16 +441,16 @@ _distutils-r1_wrap_scripts() {
mv "${f}" "${newf}" || die mv "${f}" "${newf}" || die
fi fi
debug-print "${FUNCNAME}: installing wrapper at /usr/bin/${basename}" debug-print "${FUNCNAME}: installing wrapper at ${bindir}/${basename}"
_python_ln_rel "${path}${EPREFIX}"$(_python_get_wrapper_path) \ _python_ln_rel "${path}${EPREFIX}"$(_python_get_wrapper_path) \
"${path}${EPREFIX}/usr/bin/${basename}" || die "${path}${bindir}/${basename}" || die
elif _python_want_python_exec2; then elif _python_want_python_exec2; then
debug-print "${FUNCNAME}: non-matching shebang: ${shebang}" debug-print "${FUNCNAME}: non-matching shebang: ${shebang}"
debug-print "${FUNCNAME}: moving to /usr/bin/${basename}" debug-print "${FUNCNAME}: moving to ${bindir}/${basename}"
mv "${f}" "${path}${EPREFIX}/usr/bin/${basename}" || die mv "${f}" "${path}${bindir}/${basename}" || die
fi fi
done < <(find "${path}${PYTHON_SCRIPTDIR}" -type f -print0) done < <(find "${path}${PYTHON_SCRIPTDIR}" -mindepth 1 -print0)
} }
# @FUNCTION: distutils-r1_python_install # @FUNCTION: distutils-r1_python_install
@ -463,6 +463,7 @@ _distutils-r1_wrap_scripts() {
distutils-r1_python_install() { distutils-r1_python_install() {
debug-print-function ${FUNCNAME} "${@}" debug-print-function ${FUNCNAME} "${@}"
local args=( "${@}" )
local flags local flags
case "${EPYTHON}" in case "${EPYTHON}" in
@ -485,21 +486,59 @@ distutils-r1_python_install() {
[[ ${DISTUTILS_SINGLE_IMPL} ]] && root=${D} [[ ${DISTUTILS_SINGLE_IMPL} ]] && root=${D}
flags+=( --root="${root}" ) flags+=( --root="${root}" )
if [[ ! ${DISTUTILS_SINGLE_IMPL} ]] && _python_want_python_exec2 if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
then # user may override --install-scripts
local PYTHON_SCRIPTDIR # note: this is poor but distutils argv parsing is dumb
python_export PYTHON_SCRIPTDIR local mydistutilsargs=( "${mydistutilsargs[@]}" )
flags+=( --install-scripts="${PYTHON_SCRIPTDIR}" ) local scriptdir=${EPREFIX}/usr/bin
# construct a list of mydistutilsargs[0] args[0] args[1]...
local arg arg_vars
[[ ${mydistutilsargs[@]} ]] && eval arg_vars+=(
'mydistutilsargs['{0..$(( ${#mydistutilsargs[@]} - 1 ))}']'
)
[[ ${args[@]} ]] && eval arg_vars+=(
'args['{0..$(( ${#args[@]} - 1 ))}']'
)
set -- "${arg_vars[@]}"
while [[ ${@} ]]; do
local arg_var=${1}
shift
local a=${!arg_var}
case "${a}" in
--install-scripts=*)
scriptdir=${a#--install-scripts=}
if _python_want_python_exec2; then
unset "${arg_var}"
fi
;;
--install-scripts)
scriptdir=${!1}
if _python_want_python_exec2; then
unset "${arg_var}" "${1}"
fi
shift
;;
esac
done
if _python_want_python_exec2; then
local PYTHON_SCRIPTDIR
python_export PYTHON_SCRIPTDIR
flags+=( --install-scripts="${PYTHON_SCRIPTDIR}" )
fi
fi fi
esetup.py install "${flags[@]}" "${@}" esetup.py install "${flags[@]}" "${args[@]}"
if [[ -d ${root}$(python_get_sitedir)/tests ]]; then if [[ -d ${root}$(python_get_sitedir)/tests ]]; then
die "Package installs 'tests' package, file collisions likely." die "Package installs 'tests' package, file collisions likely."
fi fi
if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
_distutils-r1_wrap_scripts "${root}" _distutils-r1_wrap_scripts "${root}" "${scriptdir}"
multibuild_merge_root "${root}" "${D}" multibuild_merge_root "${root}" "${D}"
fi fi
} }
@ -545,9 +584,12 @@ distutils-r1_run_phase() {
fi fi
local -x PYTHONPATH="${BUILD_DIR}/lib:${PYTHONPATH}" local -x PYTHONPATH="${BUILD_DIR}/lib:${PYTHONPATH}"
local TMPDIR=${T}/${EPYTHON} if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
local -x TMPDIR=${T}/${EPYTHON}
local -x HOME=${TMPDIR}/home
mkdir -p "${TMPDIR}" || die mkdir -p "${TMPDIR}" "${HOME}" || die
fi
"${@}" "${@}"

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.86 2013/09/04 19:16:40 ulm Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.87 2013/11/04 21:36:36 ulm Exp $
# #
# @ECLASS: elisp-common.eclass # @ECLASS: elisp-common.eclass
# @MAINTAINER: # @MAINTAINER:
@ -362,6 +362,11 @@ elisp-site-regen() {
return 1 return 1
fi fi
if [[ ${EBUILD_PHASE} = *rm && ! -e ${sitelisp}/site-gentoo.el ]]; then
ewarn "Refusing to create site-gentoo.el in ${EBUILD_PHASE} phase."
return 0
fi
ebegin "Regenerating site-gentoo.el for GNU Emacs (${EBUILD_PHASE})" ebegin "Regenerating site-gentoo.el for GNU Emacs (${EBUILD_PHASE})"
for sf in "${sitelisp}"/[0-9][0-9]*-gentoo.el \ for sf in "${sitelisp}"/[0-9][0-9]*-gentoo.el \

View File

@ -1,12 +1,15 @@
# Copyright 1999-2012 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/enlightenment.eclass,v 1.101 2013/08/31 13:04:51 tommy Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/enlightenment.eclass,v 1.105 2013/10/12 15:30:23 aballier Exp $
# @ECLASS: enlightenment.eclass # @ECLASS: enlightenment.eclass
# @MAINTAINER: # @MAINTAINER:
# enlightenment@gentoo.org # enlightenment@gentoo.org
# @BLURB: simplify enlightenment package management # @BLURB: simplify enlightenment package management
if [[ ${___ECLASS_ONCE_ENLIGHTENMENT} != "recur -_+^+_- spank" ]] ; then
___ECLASS_ONCE_ENLIGHTENMENT="recur -_+^+_- spank"
inherit eutils libtool inherit eutils libtool
# @ECLASS-VARIABLE: E_PYTHON # @ECLASS-VARIABLE: E_PYTHON
@ -93,24 +96,26 @@ fi
ENLIGHTENMENT_EXPF="src_unpack src_compile src_install" ENLIGHTENMENT_EXPF="src_unpack src_compile src_install"
case "${EAPI:-0}" in case "${EAPI:-0}" in
2|3|4|5) ENLIGHTENMENT_EXPF+=" src_prepare src_configure" ;; 2|3|4|5) ENLIGHTENMENT_EXPF+=" src_prepare src_configure" ;;
*) ;; *) ;;
esac esac
EXPORT_FUNCTIONS ${ENLIGHTENMENT_EXPF} EXPORT_FUNCTIONS ${ENLIGHTENMENT_EXPF}
DESCRIPTION="A DR17 production" DESCRIPTION="A DR17 production"
HOMEPAGE="http://www.enlightenment.org/" HOMEPAGE="http://www.enlightenment.org/"
case ${EURI_STATE:-${E_STATE}} in if [[ -z ${SRC_URI} ]] ; then
case ${EURI_STATE:-${E_STATE}} in
release) SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.gz";; release) SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.gz";;
snap) SRC_URI="http://download.enlightenment.org/snapshots/${E_SNAP_DATE}/${P}.tar.bz2";; snap) SRC_URI="http://download.enlightenment.org/snapshots/${E_SNAP_DATE}/${P}.tar.bz2";;
live) SRC_URI="";; live) SRC_URI="";;
esac esac
fi
LICENSE="BSD" LICENSE="BSD"
SLOT="0" SLOT="0"
case ${EKEY_STATE:-${E_STATE}} in case ${EKEY_STATE:-${E_STATE}} in
release) KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-interix ~x86-solaris ~x64-solaris";; release) KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-interix ~x86-solaris ~x64-solaris";;
snap) KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-interix ~x86-solaris ~x64-solaris";; snap) KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-interix ~x86-solaris ~x64-solaris";;
live) KEYWORDS="";; live) KEYWORDS="";;
esac esac
IUSE="nls doc" IUSE="nls doc"
@ -190,3 +195,5 @@ enlightenment_src_install() {
use static-libs || find "${D}" -name '*.la' -exec rm -f {} + use static-libs || find "${D}" -name '*.la' -exec rm -f {} +
fi fi
} }
fi

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.188 2013/09/05 05:28:01 vapier Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.192 2013/11/02 03:20:37 dirtyepic Exp $
# @ECLASS: flag-o-matic.eclass # @ECLASS: flag-o-matic.eclass
# @MAINTAINER: # @MAINTAINER:
@ -29,13 +29,13 @@ setup-allowed-flags() {
ALLOWED_FLAGS+=" -fbounds-checking -fno-strict-overflow" ALLOWED_FLAGS+=" -fbounds-checking -fno-strict-overflow"
ALLOWED_FLAGS+=" -fno-PIE -fno-pie -fno-unit-at-a-time" ALLOWED_FLAGS+=" -fno-PIE -fno-pie -fno-unit-at-a-time"
ALLOWED_FLAGS+=" -g -g[0-9] -ggdb -ggdb[0-9] -gstabs -gstabs+" ALLOWED_FLAGS+=" -g -g[0-9] -ggdb -ggdb[0-9] -gstabs -gstabs+"
ALLOWED_FLAGS+=" -fno-ident -fpermissive" ALLOWED_FLAGS+=" -fno-ident -fpermissive -frecord-gcc-switches"
ALLOWED_FLAGS+=" -W* -w" ALLOWED_FLAGS+=" -W* -w"
# allow a bunch of flags that negate features / control ABI # allow a bunch of flags that negate features / control ABI
ALLOWED_FLAGS+=" -fno-stack-protector -fno-stack-protector-all \ ALLOWED_FLAGS+=" -fno-stack-protector -fno-stack-protector-all \
-fno-strict-aliasing -fno-bounds-checking -fstrict-overflow \ -fno-strict-aliasing -fno-bounds-checking -fstrict-overflow \
-fno-omit-frame-pointer" -fno-omit-frame-pointer -fno-builtin*"
ALLOWED_FLAGS+=" -mregparm -mno-app-regs -mapp-regs -mno-mmx -mno-sse \ ALLOWED_FLAGS+=" -mregparm -mno-app-regs -mapp-regs -mno-mmx -mno-sse \
-mno-sse2 -mno-sse3 -mno-ssse3 -mno-sse4 -mno-sse4.1 -mno-sse4.2 \ -mno-sse2 -mno-sse3 -mno-ssse3 -mno-sse4 -mno-sse4.1 -mno-sse4.2 \
-mno-avx -mno-aes -mno-pclmul -mno-sse4a -mno-3dnow -mno-popcnt \ -mno-avx -mno-aes -mno-pclmul -mno-sse4a -mno-3dnow -mno-popcnt \
@ -144,38 +144,53 @@ filter-ldflags() {
# Add extra <flags> to the current CPPFLAGS. # Add extra <flags> to the current CPPFLAGS.
append-cppflags() { append-cppflags() {
[[ $# -eq 0 ]] && return 0 [[ $# -eq 0 ]] && return 0
export CPPFLAGS="${CPPFLAGS} $*" export CPPFLAGS+=" $*"
return 0 return 0
} }
# @FUNCTION: append-cflags # @FUNCTION: append-cflags
# @USAGE: <flags> # @USAGE: <flags>
# @DESCRIPTION: # @DESCRIPTION:
# Add extra <flags> to the current CFLAGS. # Add extra <flags> to the current CFLAGS. If a flag might not be supported
# with different compilers (or versions), then use test-flags-CC like so:
# @CODE
# append-cflags $(test-flags-CC -funky-flag)
# @CODE
append-cflags() { append-cflags() {
[[ $# -eq 0 ]] && return 0 [[ $# -eq 0 ]] && return 0
export CFLAGS=$(test-flags-CC ${CFLAGS} "$@") # Do not do automatic flag testing ourselves. #417047
export CFLAGS+=" $*"
return 0 return 0
} }
# @FUNCTION: append-cxxflags # @FUNCTION: append-cxxflags
# @USAGE: <flags> # @USAGE: <flags>
# @DESCRIPTION: # @DESCRIPTION:
# Add extra <flags> to the current CXXFLAGS. # Add extra <flags> to the current CXXFLAGS. If a flag might not be supported
# with different compilers (or versions), then use test-flags-CXX like so:
# @CODE
# append-cxxflags $(test-flags-CXX -funky-flag)
# @CODE
append-cxxflags() { append-cxxflags() {
[[ $# -eq 0 ]] && return 0 [[ $# -eq 0 ]] && return 0
export CXXFLAGS=$(test-flags-CXX ${CXXFLAGS} "$@") # Do not do automatic flag testing ourselves. #417047
export CXXFLAGS+=" $*"
return 0 return 0
} }
# @FUNCTION: append-fflags # @FUNCTION: append-fflags
# @USAGE: <flags> # @USAGE: <flags>
# @DESCRIPTION: # @DESCRIPTION:
# Add extra <flags> to the current {F,FC}FLAGS. # Add extra <flags> to the current {F,FC}FLAGS. If a flag might not be supported
# with different compilers (or versions), then use test-flags-F77 like so:
# @CODE
# append-fflags $(test-flags-F77 -funky-flag)
# @CODE
append-fflags() { append-fflags() {
[[ $# -eq 0 ]] && return 0 [[ $# -eq 0 ]] && return 0
export FFLAGS=$(test-flags-F77 ${FFLAGS} "$@") # Do not do automatic flag testing ourselves. #417047
export FCFLAGS=$(test-flags-FC ${FCFLAGS} "$@") export FFLAGS+=" $*"
export FCFLAGS+=" $*"
return 0 return 0
} }
@ -377,6 +392,9 @@ strip-flags() {
new+=( -O2 ) new+=( -O2 )
fi fi
if [[ ${!var} != "${new[*]}" ]] ; then
einfo "strip-flags: ${var}: changed '${!var}' to '${new[*]}'"
fi
eval export ${var}=\""${new[*]}"\" eval export ${var}=\""${new[*]}"\"
done done

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/git-2.eclass,v 1.32 2013/09/08 22:54:24 mgorny Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/git-2.eclass,v 1.33 2013/10/08 11:19:48 mgorny Exp $
# @ECLASS: git-2.eclass # @ECLASS: git-2.eclass
# @MAINTAINER: # @MAINTAINER:
@ -18,6 +18,7 @@
# for early testing of git-r3 and is to be set in make.conf. # for early testing of git-r3 and is to be set in make.conf.
# (since we override src_unpack this doesn't hurt) # (since we override src_unpack this doesn't hurt)
_INHERITED_BY_GIT_2=1 \
inherit git-r3 inherit git-r3
# This eclass support all EAPIs # This eclass support all EAPIs

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.5 2013/09/13 15:08:37 mgorny Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.22 2013/10/30 19:21:12 mgorny Exp $
# @ECLASS: git-r3.eclass # @ECLASS: git-r3.eclass
# @MAINTAINER: # @MAINTAINER:
@ -29,6 +29,10 @@ EXPORT_FUNCTIONS src_unpack
if [[ ! ${_GIT_R3} ]]; then if [[ ! ${_GIT_R3} ]]; then
if [[ ! ${_INHERITED_BY_GIT_2} ]]; then
DEPEND=">=dev-vcs/git-1.8.2.1"
fi
# @ECLASS-VARIABLE: EGIT3_STORE_DIR # @ECLASS-VARIABLE: EGIT3_STORE_DIR
# @DESCRIPTION: # @DESCRIPTION:
# Storage directory for git sources. # Storage directory for git sources.
@ -44,6 +48,8 @@ if [[ ! ${_GIT_R3} ]]; then
# #
# It can be overriden via env using ${PN}_LIVE_REPO variable. # It can be overriden via env using ${PN}_LIVE_REPO variable.
# #
# Can be a whitespace-separated list or an array.
#
# Example: # Example:
# @CODE # @CODE
# EGIT_REPO_URI="git://a/b.git https://c/d.git" # EGIT_REPO_URI="git://a/b.git https://c/d.git"
@ -84,8 +90,10 @@ if [[ ! ${_GIT_R3} ]]; then
# a fair number of limitations. Therefore, if you'd like the eclass to # a fair number of limitations. Therefore, if you'd like the eclass to
# perform complete clones instead, set this to a non-null value. # perform complete clones instead, set this to a non-null value.
# #
# This variable is to be set in make.conf. Ebuilds are not allowed # This variable can be set in make.conf and ebuilds. The make.conf
# to set it. # value specifies user-specific default, while ebuilds may use it
# to force deep clones when the server does not support shallow clones
# (e.g. Google Code).
# @FUNCTION: _git-r3_env_setup # @FUNCTION: _git-r3_env_setup
# @INTERNAL # @INTERNAL
@ -171,10 +179,15 @@ _git-r3_set_gitdir() {
local repo_name=${1#*://*/} local repo_name=${1#*://*/}
# strip the trailing slash
repo_name=${repo_name%/}
# strip common prefixes to make paths more likely to match # strip common prefixes to make paths more likely to match
# e.g. git://X/Y.git vs https://X/git/Y.git # e.g. git://X/Y.git vs https://X/git/Y.git
# (but just one of the prefixes) # (but just one of the prefixes)
case "${repo_name}" in case "${repo_name}" in
# gnome.org... who else?
browse/*) repo_name=${repo_name#browse/};;
# cgit can proxy requests to git # cgit can proxy requests to git
cgit/*) repo_name=${repo_name#cgit/};; cgit/*) repo_name=${repo_name#cgit/};;
# pretty common # pretty common
@ -199,7 +212,7 @@ _git-r3_set_gitdir() {
if [[ ! -d ${EGIT3_STORE_DIR} ]]; then if [[ ! -d ${EGIT3_STORE_DIR} ]]; then
( (
addwrite / addwrite /
mkdir -m0755 -p "${EGIT3_STORE_DIR}" mkdir -m0755 -p "${EGIT3_STORE_DIR}" || die
) || die "Unable to create ${EGIT3_STORE_DIR}" ) || die "Unable to create ${EGIT3_STORE_DIR}"
fi fi
@ -208,8 +221,10 @@ _git-r3_set_gitdir() {
mkdir "${GIT_DIR}" || die mkdir "${GIT_DIR}" || die
git init --bare || die git init --bare || die
# avoid auto-unshallow :) if [[ ! ${EGIT_NONSHALLOW} ]]; then
touch "${GIT_DIR}"/shallow || die # avoid auto-unshallow :)
touch "${GIT_DIR}"/shallow || die
fi
fi fi
} }
@ -237,14 +252,19 @@ _git-r3_set_submodules() {
l=${l#submodule.} l=${l#submodule.}
local subname=${l%%.url=*} local subname=${l%%.url=*}
# skip modules that have 'update = none', bug #487262.
local upd=$(echo "${data}" | git config -f /dev/fd/0 \
submodule."${subname}".update)
[[ ${upd} == none ]] && continue
submodules+=( submodules+=(
"${subname}" "${subname}"
"$(echo "${data}" | git config -f /dev/fd/0 \ "$(echo "${data}" | git config -f /dev/fd/0 \
submodule."${subname}".url)" submodule."${subname}".url || die)"
"$(echo "${data}" | git config -f /dev/fd/0 \ "$(echo "${data}" | git config -f /dev/fd/0 \
submodule."${subname}".path)" submodule."${subname}".path || die)"
) )
done < <(echo "${data}" | git config -f /dev/fd/0 -l) done < <(echo "${data}" | git config -f /dev/fd/0 -l || die)
} }
# @FUNCTION: _git-r3_smart_fetch # @FUNCTION: _git-r3_smart_fetch
@ -354,7 +374,7 @@ _git-r3_smart_fetch() {
# <local-id> specifies the local branch identifier that will be used to # <local-id> specifies the local branch identifier that will be used to
# locally store the fetch result. It should be unique to multiple # locally store the fetch result. It should be unique to multiple
# fetches within the repository that can be performed at the same time # fetches within the repository that can be performed at the same time
# (including parallel merges). It defaults to ${CATEGORY}/${PN}/${SLOT}. # (including parallel merges). It defaults to ${CATEGORY}/${PN}/${SLOT%/*}.
# This default should be fine unless you are fetching multiple trees # This default should be fine unless you are fetching multiple trees
# from the same repository in the same ebuild. # from the same repository in the same ebuild.
# #
@ -365,20 +385,30 @@ _git-r3_smart_fetch() {
git-r3_fetch() { git-r3_fetch() {
debug-print-function ${FUNCNAME} "$@" debug-print-function ${FUNCNAME} "$@"
local repos=( ${1:-${EGIT_REPO_URI}} ) [[ ${EVCS_OFFLINE} ]] && return
local repos
if [[ ${1} ]]; then
repos=( ${1} )
elif [[ $(declare -p EGIT_REPO_URI) == "declare -a"* ]]; then
repos=( "${EGIT_REPO_URI[@]}" )
else
repos=( ${EGIT_REPO_URI} )
fi
local branch=${EGIT_BRANCH:+refs/heads/${EGIT_BRANCH}} local branch=${EGIT_BRANCH:+refs/heads/${EGIT_BRANCH}}
local remote_ref=${2:-${EGIT_COMMIT:-${branch:-HEAD}}} local remote_ref=${2:-${EGIT_COMMIT:-${branch:-HEAD}}}
local local_id=${3:-${CATEGORY}/${PN}/${SLOT}} local local_id=${3:-${CATEGORY}/${PN}/${SLOT%/*}}
local local_ref=refs/heads/${local_id}/__main__ local local_ref=refs/heads/${local_id}/__main__
[[ ${repos[@]} ]] || die "No URI provided and EGIT_REPO_URI unset" [[ ${repos[@]} ]] || die "No URI provided and EGIT_REPO_URI unset"
local -x GIT_DIR local -x GIT_DIR
_git-r3_set_gitdir ${repos[0]} _git-r3_set_gitdir "${repos[0]}"
# try to fetch from the remote # try to fetch from the remote
local r success local r success
for r in ${repos[@]}; do for r in "${repos[@]}"; do
einfo "Fetching ${remote_ref} from ${r} ..." einfo "Fetching ${remote_ref} from ${r} ..."
local is_branch lookup_ref local is_branch lookup_ref
@ -426,6 +456,8 @@ git-r3_fetch() {
if [[ -f ${GIT_DIR}/shallow ]]; then if [[ -f ${GIT_DIR}/shallow ]]; then
ref_param+=( --unshallow ) ref_param+=( --unshallow )
fi fi
# fetch all branches
ref_param+=( "refs/heads/*:refs/remotes/origin/*" )
else else
# 'git show-ref --heads' returns 1 when there are no branches # 'git show-ref --heads' returns 1 when there are no branches
if ! git show-ref --heads -q; then if ! git show-ref --heads -q; then
@ -483,8 +515,13 @@ git-r3_fetch() {
if [[ ! ${commit} ]]; then if [[ ! ${commit} ]]; then
die "Unable to get commit id for submodule ${subname}" die "Unable to get commit id for submodule ${subname}"
fi fi
if [[ ${url} == ./* || ${url} == ../* ]]; then
local subrepos=( "${repos[@]/%//${url}}" )
else
local subrepos=( "${url}" )
fi
git-r3_fetch "${url}" "${commit}" "${local_id}/${subname}" git-r3_fetch "${subrepos[*]}" "${commit}" "${local_id}/${subname}"
submodules=( "${submodules[@]:3}" ) # shift submodules=( "${submodules[@]:3}" ) # shift
done done
@ -514,14 +551,22 @@ git-r3_fetch() {
git-r3_checkout() { git-r3_checkout() {
debug-print-function ${FUNCNAME} "$@" debug-print-function ${FUNCNAME} "$@"
local repos=( ${1:-${EGIT_REPO_URI}} ) local repos
if [[ ${1} ]]; then
repos=( ${1} )
elif [[ $(declare -p EGIT_REPO_URI) == "declare -a"* ]]; then
repos=( "${EGIT_REPO_URI[@]}" )
else
repos=( ${EGIT_REPO_URI} )
fi
local out_dir=${2:-${EGIT_CHECKOUT_DIR:-${WORKDIR}/${P}}} local out_dir=${2:-${EGIT_CHECKOUT_DIR:-${WORKDIR}/${P}}}
local local_id=${3:-${CATEGORY}/${PN}/${SLOT}} local local_id=${3:-${CATEGORY}/${PN}/${SLOT%/*}}
local -x GIT_DIR GIT_WORK_TREE local -x GIT_DIR GIT_WORK_TREE
_git-r3_set_gitdir ${repos[0]} _git-r3_set_gitdir "${repos[0]}"
GIT_WORK_TREE=${out_dir} GIT_WORK_TREE=${out_dir}
mkdir -p "${GIT_WORK_TREE}" mkdir -p "${GIT_WORK_TREE}" || die
einfo "Checking out ${repos[0]} to ${out_dir} ..." einfo "Checking out ${repos[0]} to ${out_dir} ..."
@ -534,9 +579,25 @@ git-r3_checkout() {
fi fi
fi fi
# Note: this is a hack to avoid parallel checkout issues.
# I will try to handle it without locks when I have more time.
local lockfile=${GIT_DIR}/.git-r3_checkout_lock
local lockfile_l=${lockfile}.${BASHPID}
touch "${lockfile_l}" || die
until ln "${lockfile_l}" "${lockfile}" &>/dev/null; do
sleep 1
done
rm "${lockfile_l}" || die
set -- git checkout -f "${local_id}"/__main__ . set -- git checkout -f "${local_id}"/__main__ .
echo "${@}" >&2 echo "${@}" >&2
"${@}" || die "git checkout ${local_id}/__main__ failed" "${@}"
local ret=${?}
# Remove the lock!
rm "${lockfile}" || die
[[ ${ret} == 0 ]] || die "git checkout ${local_id}/__main__ failed"
# diff against previous revision (if any) # diff against previous revision (if any)
local new_commit_id=$(git rev-parse --verify "${local_id}"/__main__) local new_commit_id=$(git rev-parse --verify "${local_id}"/__main__)
@ -575,6 +636,10 @@ git-r3_checkout() {
local url=${submodules[1]} local url=${submodules[1]}
local path=${submodules[2]} local path=${submodules[2]}
if [[ ${url} == ./* || ${url} == ../* ]]; then
url=${repos[0]%%/}/${url}
fi
git-r3_checkout "${url}" "${GIT_WORK_TREE}/${path}" \ git-r3_checkout "${url}" "${GIT_WORK_TREE}/${path}" \
"${local_id}/${subname}" "${local_id}/${subname}"
@ -585,6 +650,11 @@ git-r3_checkout() {
# keep this *after* submodules # keep this *after* submodules
export EGIT_DIR=${GIT_DIR} export EGIT_DIR=${GIT_DIR}
export EGIT_VERSION=${new_commit_id} export EGIT_VERSION=${new_commit_id}
# create a fake '.git' directory to satisfy 'git rev-parse HEAD'
GIT_DIR=${GIT_WORK_TREE}/.git
git init || die
echo "${EGIT_VERSION}" > "${GIT_WORK_TREE}"/.git/HEAD || die
} }
# @FUNCTION: git-r3_peek_remote_ref # @FUNCTION: git-r3_peek_remote_ref
@ -611,14 +681,22 @@ git-r3_checkout() {
git-r3_peek_remote_ref() { git-r3_peek_remote_ref() {
debug-print-function ${FUNCNAME} "$@" debug-print-function ${FUNCNAME} "$@"
local repos=( ${1:-${EGIT_REPO_URI}} ) local repos
if [[ ${1} ]]; then
repos=( ${1} )
elif [[ $(declare -p EGIT_REPO_URI) == "declare -a"* ]]; then
repos=( "${EGIT_REPO_URI[@]}" )
else
repos=( ${EGIT_REPO_URI} )
fi
local branch=${EGIT_BRANCH:+refs/heads/${EGIT_BRANCH}} local branch=${EGIT_BRANCH:+refs/heads/${EGIT_BRANCH}}
local remote_ref=${2:-${EGIT_COMMIT:-${branch:-HEAD}}} local remote_ref=${2:-${EGIT_COMMIT:-${branch:-HEAD}}}
[[ ${repos[@]} ]] || die "No URI provided and EGIT_REPO_URI unset" [[ ${repos[@]} ]] || die "No URI provided and EGIT_REPO_URI unset"
local r success local r success
for r in ${repos[@]}; do for r in "${repos[@]}"; do
einfo "Peeking ${remote_ref} on ${r} ..." >&2 einfo "Peeking ${remote_ref} on ${r} ..." >&2
local is_branch lookup_ref local is_branch lookup_ref
@ -649,8 +727,6 @@ git-r3_peek_remote_ref() {
git-r3_src_fetch() { git-r3_src_fetch() {
debug-print-function ${FUNCNAME} "$@" debug-print-function ${FUNCNAME} "$@"
[[ ${EVCS_OFFLINE} ]] && return
if [[ ! ${EGIT3_STORE_DIR} && ${EGIT_STORE_DIR} ]]; then if [[ ! ${EGIT3_STORE_DIR} && ${EGIT_STORE_DIR} ]]; then
ewarn "You have set EGIT_STORE_DIR but not EGIT3_STORE_DIR. Please consider" ewarn "You have set EGIT_STORE_DIR but not EGIT3_STORE_DIR. Please consider"
ewarn "setting EGIT3_STORE_DIR for git-r3.eclass. It is recommended to use" ewarn "setting EGIT3_STORE_DIR for git-r3.eclass. It is recommended to use"

View File

@ -1,473 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/git.eclass,v 1.62 2013/08/02 15:41:17 mgorny Exp $
# @DEAD
# Michał Górny <mgorny@gentoo.org> (2 Aug 2013)
# This eclass has been superseded by git-2 eclass and will be removed
# on 2013-09-02. Please modify your ebuilds to use git-2 instead.
# Bug #479474.
# @ECLASS: git.eclass
# @MAINTAINER:
# Donnie Berkholz <dberkholz@gentoo.org>
# @BLURB: Fetching and unpacking of git repositories
# @DESCRIPTION:
# The git eclass provides functions to fetch, patch and bootstrap
# software sources from git repositories and is based on the subversion eclass.
# It is necessary to define at least the EGIT_REPO_URI variable.
#
# THANKS TO:
# Fernando J. Pereda <ferdy@gentoo.org>
inherit eutils
EGIT="git.eclass"
# We DEPEND on a not too ancient git version
DEPEND=">=dev-vcs/git-1.6"
EXPORTED_FUNCTIONS="src_unpack"
case "${EAPI:-0}" in
2|3|4|5) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare" ;;
1|0) ;;
*) die "EAPI=${EAPI} is not supported" ;;
esac
EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
# define some nice defaults but only if nothing is set already
: ${HOMEPAGE:=http://git-scm.com/}
# @ECLASS-VARIABLE: EGIT_QUIET
# @DESCRIPTION:
# Set to non-empty value to supress some eclass messages.
: ${EGIT_QUIET:=${ESCM_QUIET}}
# @ECLASS-VARIABLE: EGIT_STORE_DIR
# @DESCRIPTION:
# Storage directory for git sources.
# Can be redefined.
: ${EGIT_STORE_DIR:="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/git-src"}
# @ECLASS-VARIABLE: EGIT_UNPACK_DIR
# @DESCRIPTION:
# Directory to unpack git sources in.
# @ECLASS-VARIABLE: EGIT_HAS_SUBMODULES
# @DESCRIPTION:
# Set this to non-empty value to enable submodule support (slower).
: ${EGIT_HAS_SUBMODULES:=}
# @ECLASS-VARIABLE: EGIT_FETCH_CMD
# @DESCRIPTION:
# Command for cloning the repository.
: ${EGIT_FETCH_CMD:="git clone"}
# @ECLASS-VARIABLE: EGIT_UPDATE_CMD
# @DESCRIPTION:
# Git fetch command.
if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
EGIT_UPDATE_CMD="git pull -f -u"
else
EGIT_UPDATE_CMD="git fetch -f -u"
fi
# @ECLASS-VARIABLE: EGIT_DIFFSTAT_CMD
# @DESCRIPTION:
# Git command for diffstat.
EGIT_DIFFSTAT_CMD="git --no-pager diff --stat"
# @ECLASS-VARIABLE: EGIT_OPTIONS
# @DESCRIPTION:
# This variable value is passed to clone and fetch.
: ${EGIT_OPTIONS:=}
# @ECLASS-VARIABLE: EGIT_MASTER
# @DESCRIPTION:
# Variable for specifying master branch.
# Usefull when upstream don't have master branch.
: ${EGIT_MASTER:=master}
# @ECLASS-VARIABLE: EGIT_REPO_URI
# @DESCRIPTION:
# URI for the repository
# e.g. http://foo, git://bar
# Supported protocols:
# http://
# https://
# git://
# git+ssh://
# rsync://
# ssh://
eval X="\$${PN//[-+]/_}_LIVE_REPO"
if [[ ${X} = "" ]]; then
: ${EGIT_REPO_URI:=}
else
EGIT_REPO_URI="${X}"
fi
# @ECLASS-VARIABLE: EGIT_PROJECT
# @DESCRIPTION:
# Project name, it must be unique across EGIT_STORE_DIR.
# Git eclass will check out the git repository into ${EGIT_STORE_DIR}/${EGIT_PROJECT}/${EGIT_REPO_URI##*/}
# Default is ${PN}.
: ${EGIT_PROJECT:=${PN}}
# @ECLASS-VARIABLE: EGIT_BOOTSTRAP
# @DESCRIPTION:
# bootstrap script or command like autogen.sh or etc...
: ${EGIT_BOOTSTRAP:=}
# @ECLASS-VARIABLE: EGIT_OFFLINE
# @DESCRIPTION:
# Set this variable to a non-empty value to disable the automatic updating of
# an GIT source tree. This is intended to be set outside the git source
# tree by users.
: ${EGIT_OFFLINE:=${ESCM_OFFLINE}}
# @ECLASS-VARIABLE: EGIT_PATCHES
# @DESCRIPTION:
# Similar to PATCHES array from base.eclass
# Only difference is that this patches are applied before bootstrap.
# Please take note that this variable should be bash array.
# @ECLASS-VARIABLE: EGIT_BRANCH
# @DESCRIPTION:
# git eclass can fetch any branch in git_fetch().
eval X="\$${PN//[-+]/_}_LIVE_BRANCH"
if [[ "${X}" = "" ]]; then
: ${EGIT_BRANCH:=master}
else
EGIT_BRANCH="${X}"
fi
# @ECLASS-VARIABLE: EGIT_COMMIT
# @DESCRIPTION:
# git eclass can checkout any commit.
eval X="\$${PN//[-+]/_}_LIVE_COMMIT"
if [[ "${X}" = "" ]]; then
: ${EGIT_COMMIT:=${EGIT_BRANCH}}
else
EGIT_COMMIT="${X}"
fi
# @ECLASS-VARIABLE: EGIT_REPACK
# @DESCRIPTION:
# Set to non-empty value to repack objects to save disk space. However this can
# take a long time with VERY big repositories.
: ${EGIT_REPACK:=}
# @ECLASS-VARIABLE: EGIT_PRUNE
# @DESCRIPTION:
# Set to non-empty value to prune loose objects on each fetch. This is useful
# if upstream rewinds and rebases branches often.
: ${EGIT_PRUNE:=}
# @FUNCTION: git_submodules
# @DESCRIPTION:
# Internal function wrapping the submodule initialisation and update
git_submodules() {
if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
debug-print "git submodule init"
git submodule init
debug-print "git submodule sync"
git submodule sync
debug-print "git submodule update"
git submodule update
fi
}
# @FUNCTION: git_branch
# @DESCRIPTION:
# Internal function that changes branch for the repo based on EGIT_TREE and
# EGIT_BRANCH variables.
git_branch() {
local branchname=branch-${EGIT_BRANCH} src=origin/${EGIT_BRANCH}
if [[ "${EGIT_COMMIT}" != "${EGIT_BRANCH}" ]]; then
branchname=tree-${EGIT_COMMIT}
src=${EGIT_COMMIT}
fi
debug-print "git checkout -b ${branchname} ${src}"
git checkout -b ${branchname} ${src} &> /dev/null
unset branchname src
}
# @FUNCTION: git_fetch
# @DESCRIPTION:
# Gets repository from EGIT_REPO_URI and store it in specified EGIT_STORE_DIR
git_fetch() {
debug-print-function ${FUNCNAME} "$@"
eqawarn "git.eclass is deprecated."
eqawarn "Please update your ebuilds to use git-2 instead. For details, see"
eqawarn "http://archives.gentoo.org/gentoo-dev/msg_b7ba363cae580845819ae3501fb157e9.xml"
local GIT_DIR EGIT_CLONE_DIR oldsha1 cursha1 extra_clone_opts upstream_branch
[[ -z ${EGIT_HAS_SUBMODULES} ]] && export GIT_DIR
# choose if user wants elog or just einfo.
if [[ -n ${EGIT_QUIET} ]]; then
elogcmd="einfo"
else
elogcmd="elog"
fi
# If we have same branch and the tree we can do --depth 1 clone
# which outputs into really smaller data transfers.
# Sadly we can do shallow copy for now because quite a few packages need .git
# folder.
#[[ ${EGIT_COMMIT} = ${EGIT_BRANCH} ]] && \
# EGIT_FETCH_CMD="${EGIT_FETCH_CMD} --depth 1"
if [[ -n ${EGIT_TREE} ]] ; then
EGIT_COMMIT=${EGIT_TREE}
ewarn "QA: Usage of deprecated EGIT_TREE variable detected."
ewarn "QA: Use EGIT_COMMIT variable instead."
fi
# EGIT_REPO_URI is empty.
[[ -z ${EGIT_REPO_URI} ]] && die "${EGIT}: EGIT_REPO_URI is empty."
# check for the protocol or pull from a local repo.
if [[ -z ${EGIT_REPO_URI%%:*} ]] ; then
case ${EGIT_REPO_URI%%:*} in
git*|http|https|rsync|ssh) ;;
*) die "${EGIT}: protocol for fetch from "${EGIT_REPO_URI%:*}" is not yet implemented in eclass." ;;
esac
fi
# initial clone, we have to create master git storage directory and play
# nicely with sandbox
if [[ ! -d ${EGIT_STORE_DIR} ]] ; then
debug-print "${FUNCNAME}: initial clone. creating git directory"
addwrite /
mkdir -m 775 -p "${EGIT_STORE_DIR}" \
|| die "${EGIT}: can't mkdir ${EGIT_STORE_DIR}."
export SANDBOX_WRITE="${SANDBOX_WRITE%%:/}"
fi
cd -P "${EGIT_STORE_DIR}" || die "${EGIT}: can't chdir to ${EGIT_STORE_DIR}"
EGIT_STORE_DIR=${PWD}
# allow writing into EGIT_STORE_DIR
addwrite "${EGIT_STORE_DIR}"
[[ -z ${EGIT_REPO_URI##*/} ]] && EGIT_REPO_URI="${EGIT_REPO_URI%/}"
EGIT_CLONE_DIR="${EGIT_PROJECT}"
debug-print "${FUNCNAME}: EGIT_OPTIONS = \"${EGIT_OPTIONS}\""
GIT_DIR="${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}"
# we also have to remove all shallow copied repositories
# and fetch them again
if [[ -e "${GIT_DIR}/shallow" ]]; then
rm -rf "${GIT_DIR}"
einfo "The ${EGIT_CLONE_DIR} was shallow copy. Refetching."
fi
# repack from bare copy to normal one
if [[ -n ${EGIT_HAS_SUBMODULES} ]] && [[ -d ${GIT_DIR} && ! -d ${GIT_DIR}/.git ]]; then
rm -rf "${GIT_DIR}"
einfo "The ${EGIT_CLONE_DIR} was bare copy. Refetching."
fi
if [[ -z ${EGIT_HAS_SUBMODULES} ]] && [[ -d ${GIT_DIR} && -d ${GIT_DIR}/.git ]]; then
rm -rf "${GIT_DIR}"
einfo "The ${EGIT_CLONE_DIR} was not a bare copy. Refetching."
fi
if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
upstream_branch=origin/${EGIT_BRANCH}
else
upstream_branch=${EGIT_BRANCH}
extra_clone_opts=--bare
fi
if [[ ! -d ${GIT_DIR} ]] ; then
# first clone
${elogcmd} "GIT NEW clone -->"
${elogcmd} " repository: ${EGIT_REPO_URI}"
debug-print "${EGIT_FETCH_CMD} ${extra_clone_opts} ${EGIT_OPTIONS} \"${EGIT_REPO_URI}\" ${GIT_DIR}"
${EGIT_FETCH_CMD} ${extra_clone_opts} ${EGIT_OPTIONS} "${EGIT_REPO_URI}" ${GIT_DIR} \
|| die "${EGIT}: can't fetch from ${EGIT_REPO_URI}."
pushd "${GIT_DIR}" &> /dev/null
cursha1=$(git rev-parse ${upstream_branch})
${elogcmd} " at the commit: ${cursha1}"
git_submodules
popd &> /dev/null
elif [[ -n ${EGIT_OFFLINE} ]] ; then
pushd "${GIT_DIR}" &> /dev/null
cursha1=$(git rev-parse ${upstream_branch})
${elogcmd} "GIT offline update -->"
${elogcmd} " repository: ${EGIT_REPO_URI}"
${elogcmd} " at the commit: ${cursha1}"
popd &> /dev/null
else
pushd "${GIT_DIR}" &> /dev/null
# Git urls might change, so unconditionally set it here
git config remote.origin.url "${EGIT_REPO_URI}"
# fetch updates
${elogcmd} "GIT update -->"
${elogcmd} " repository: ${EGIT_REPO_URI}"
oldsha1=$(git rev-parse ${upstream_branch})
if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
debug-print "${EGIT_UPDATE_CMD} ${EGIT_OPTIONS}"
# fix branching
git checkout ${EGIT_MASTER}
for x in $(git branch |grep -v "* ${EGIT_MASTER}" |tr '\n' ' '); do
git branch -D ${x}
done
${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} \
|| die "${EGIT}: can't update from ${EGIT_REPO_URI}."
else
debug-print "${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} origin ${EGIT_BRANCH}:${EGIT_BRANCH}"
${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} origin ${EGIT_BRANCH}:${EGIT_BRANCH} \
|| die "${EGIT}: can't update from ${EGIT_REPO_URI}."
fi
git_submodules
cursha1=$(git rev-parse ${upstream_branch})
# write out message based on the revisions
if [[ "${oldsha1}" != "${cursha1}" ]]; then
${elogcmd} " updating from commit: ${oldsha1}"
${elogcmd} " to commit: ${cursha1}"
else
${elogcmd} " at the commit: ${cursha1}"
# @ECLASS-VARIABLE: LIVE_FAIL_FETCH_IF_REPO_NOT_UPDATED
# @DESCRIPTION:
# If this variable is set to TRUE in make.conf or somewhere in
# enviroment the package will fail if there is no update, thus in
# combination with --keep-going it would lead in not-updating
# pakcages that are up-to-date.
# TODO: this can lead to issues if more projects/packages use same repo
[[ ${LIVE_FAIL_FETCH_IF_REPO_NOT_UPDATED} = true ]] && \
debug-print "${FUNCNAME}: Repository \"${EGIT_REPO_URI}\" is up-to-date. Skipping." && \
die "${EGIT}: Repository \"${EGIT_REPO_URI}\" is up-to-date. Skipping."
fi
${EGIT_DIFFSTAT_CMD} ${oldsha1}..${upstream_branch}
popd &> /dev/null
fi
pushd "${GIT_DIR}" &> /dev/null
if [[ -n ${EGIT_REPACK} ]] || [[ -n ${EGIT_PRUNE} ]]; then
ebegin "Garbage collecting the repository"
local args
[[ -n ${EGIT_PRUNE} ]] && args='--prune'
git gc ${args}
eend $?
fi
popd &> /dev/null
# export the git version
export EGIT_VERSION="${cursha1}"
# log the repo state
[[ "${EGIT_COMMIT}" != "${EGIT_BRANCH}" ]] && ${elogcmd} " commit: ${EGIT_COMMIT}"
${elogcmd} " branch: ${EGIT_BRANCH}"
${elogcmd} " storage directory: \"${GIT_DIR}\""
if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
pushd "${GIT_DIR}" &> /dev/null
debug-print "rsync -rlpgo . \"${EGIT_UNPACK_DIR:-${S}}\""
time rsync -rlpgo . "${EGIT_UNPACK_DIR:-${S}}"
popd &> /dev/null
else
unset GIT_DIR
debug-print "git clone -l -s -n \"${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}\" \"${EGIT_UNPACK_DIR:-${S}}\""
git clone -l -s -n "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" "${EGIT_UNPACK_DIR:-${S}}"
fi
pushd "${EGIT_UNPACK_DIR:-${S}}" &> /dev/null
git_branch
# submodules always reqire net (thanks to branches changing)
[[ -z ${EGIT_OFFLINE} ]] && git_submodules
popd &> /dev/null
echo ">>> Unpacked to ${EGIT_UNPACK_DIR:-${S}}"
}
# @FUNCTION: git_bootstrap
# @DESCRIPTION:
# Runs bootstrap command if EGIT_BOOTSTRAP variable contains some value
# Remember that what ever gets to the EGIT_BOOTSTRAP variable gets evaled by bash.
git_bootstrap() {
debug-print-function ${FUNCNAME} "$@"
if [[ -n ${EGIT_BOOTSTRAP} ]] ; then
pushd "${S}" > /dev/null
einfo "Starting bootstrap"
if [[ -f ${EGIT_BOOTSTRAP} ]]; then
# we have file in the repo which we should execute
debug-print "$FUNCNAME: bootstraping with file \"${EGIT_BOOTSTRAP}\""
if [[ -x ${EGIT_BOOTSTRAP} ]]; then
eval "./${EGIT_BOOTSTRAP}" \
|| die "${EGIT}: bootstrap script failed"
else
eerror "\"${EGIT_BOOTSTRAP}\" is not executable."
eerror "Report upstream, or bug ebuild maintainer to remove bootstrap command."
die "${EGIT}: \"${EGIT_BOOTSTRAP}\" is not executable."
fi
else
# we execute some system command
debug-print "$FUNCNAME: bootstraping with commands \"${EGIT_BOOTSTRAP}\""
eval "${EGIT_BOOTSTRAP}" \
|| die "${EGIT}: bootstrap commands failed."
fi
einfo "Bootstrap finished"
popd > /dev/null
fi
}
# @FUNCTION: git_apply_patches
# @DESCRIPTION:
# Apply patches from EGIT_PATCHES bash array.
# Preferred is using the variable as bash array but for now it allows to write
# it also as normal space separated string list. (This part of code should be
# removed when all ebuilds get converted on bash array).
git_apply_patches() {
debug-print-function ${FUNCNAME} "$@"
pushd "${EGIT_UNPACK_DIR:-${S}}" > /dev/null
if [[ ${#EGIT_PATCHES[@]} -gt 1 ]] ; then
for i in "${EGIT_PATCHES[@]}"; do
debug-print "$FUNCNAME: git_autopatch: patching from ${i}"
epatch "${i}"
done
elif [[ -n ${EGIT_PATCHES} ]]; then
# no need for loop if space separated string is passed.
debug-print "$FUNCNAME: git_autopatch: patching from ${EGIT_PATCHES}"
epatch "${EGIT_PATCHES}"
fi
popd > /dev/null
}
# @FUNCTION: git_src_unpack
# @DESCRIPTION:
# src_upack function, calls src_prepare one if EAPI!=2.
git_src_unpack() {
debug-print-function ${FUNCNAME} "$@"
git_fetch || die "${EGIT}: unknown problem in git_fetch()."
has src_prepare ${EXPORTED_FUNCTIONS} || git_src_prepare
}
# @FUNCTION: git_src_prepare
# @DESCRIPTION:
# src_prepare function for git stuff. Patches, bootstrap...
git_src_prepare() {
debug-print-function ${FUNCNAME} "$@"
git_apply_patches
git_bootstrap
}

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.123 2013/09/03 21:54:38 eva Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.124 2013/09/29 08:49:53 pacho Exp $
# @ECLASS: gnome2.eclass # @ECLASS: gnome2.eclass
# @MAINTAINER: # @MAINTAINER:
@ -208,17 +208,7 @@ gnome2_src_install() {
dodoc ${DOCS} || die "dodoc failed" dodoc ${DOCS} || die "dodoc failed"
fi fi
else else
if ! declare -p DOCS >/dev/null 2>&1 ; then einstalldocs
local d
for d in README* ChangeLog AUTHORS NEWS TODO CHANGES THANKS BUGS \
FAQ CREDITS CHANGELOG ; do
[[ -s "${d}" ]] && dodoc "${d}"
done
elif declare -p DOCS | grep -q '^declare -a' ; then
dodoc "${DOCS[@]}"
else
dodoc ${DOCS}
fi
fi fi
# Do not keep /var/lib/scrollkeeper because: # Do not keep /var/lib/scrollkeeper because:

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins10.eclass,v 1.10 2013/01/31 19:59:54 eva Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins10.eclass,v 1.11 2013/09/29 17:47:13 eva Exp $
# @ECLASS: gst-plugins10.eclass # @ECLASS: gst-plugins10.eclass
# @MAINTAINER: # @MAINTAINER:
@ -102,7 +102,11 @@ HOMEPAGE="http://gstreamer.freedesktop.org/"
SRC_URI="http://gstreamer.freedesktop.org/src/${GST_ORG_MODULE}/${GST_ORG_MODULE}-${PV}.tar.${GST_TARBALL_SUFFIX}" SRC_URI="http://gstreamer.freedesktop.org/src/${GST_ORG_MODULE}/${GST_ORG_MODULE}-${PV}.tar.${GST_TARBALL_SUFFIX}"
LICENSE="GPL-2" LICENSE="GPL-2"
SLOT="${GST_ORG_PVP}" case ${GST_ORG_PVP} in
0.10) SLOT="0.10" ;;
1.*) SLOT="1.0" ;;
*) die "Unkown gstreamer release."
esac
S="${WORKDIR}/${GST_ORG_MODULE}-${PV}" S="${WORKDIR}/${GST_ORG_MODULE}-${PV}"

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.14 2013/07/29 09:50:09 jlec Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.15 2013/09/29 18:00:30 ottxor Exp $
# @ECLASS: intel-sdp.eclass # @ECLASS: intel-sdp.eclass
# @MAINTAINER: # @MAINTAINER:
@ -364,10 +364,6 @@ intel-sdp_pkg_setup() {
INTEL_RPMS_FULL+=( ${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.noarch.rpm ) INTEL_RPMS_FULL+=( ${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.noarch.rpm )
fi fi
done done
case "${EAPI:-0}" in
0|1|2|3) intel-sdp_pkg_pretend ;;
esac
} }
# @FUNCTION: intel-sdp_src_unpack # @FUNCTION: intel-sdp_src_unpack
@ -472,6 +468,11 @@ intel-sdp_pkg_postinst() {
"<:${r%-${_INTEL_PV4}*}-${_INTEL_PV4}:${r}:${INTEL_SDP_EDIR}:${l}:>" "<:${r%-${_INTEL_PV4}*}-${_INTEL_PV4}:${r}:${INTEL_SDP_EDIR}:${l}:>"
done done
_isdp_run-test _isdp_run-test
if [[ ${PN} = icc ]] && has_version ">=dev-util/ccache-3.1.9-r2" ; then
#add ccache links as icc might get installed after ccache
"${EROOT}"/usr/bin/ccache-config --install-links
fi
} }
# @FUNCTION: intel-sdp_pkg_postrm # @FUNCTION: intel-sdp_pkg_postrm
@ -487,11 +488,16 @@ intel-sdp_pkg_postrm() {
${INTEL_SDP_DB} ${INTEL_SDP_DB}
done done
fi fi
if [[ ${PN} = icc ]] && has_version ">=dev-util/ccache-3.1.9-r2" && [[ -z ${REPLACED_BY_VERSION} ]]; then
# --remove-links would remove all links, --install-links updates them
"${EROOT}"/usr/bin/ccache-config --install-links
fi
} }
EXPORT_FUNCTIONS pkg_setup src_unpack src_install pkg_postinst pkg_postrm EXPORT_FUNCTIONS pkg_setup src_unpack src_install pkg_postinst pkg_postrm pkg_pretend
case "${EAPI:-0}" in case "${EAPI:-0}" in
0|1|2|3) ;; 0|1|2|3)die "EAPI=${EAPI} is not supported anymore" ;;
4|5) EXPORT_FUNCTIONS pkg_pretend ;; 4|5) ;;
*) die "EAPI=${EAPI} is not supported" ;; *) die "EAPI=${EAPI} is not supported" ;;
esac esac

View File

@ -14,7 +14,18 @@
# #
# Licensed under the GNU General Public License, v2 # Licensed under the GNU General Public License, v2
# #
# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.56 2013/04/20 18:23:57 sera Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.57 2013/10/05 13:40:57 caster Exp $
# @ECLASS: java-ant-2.eclass
# @MAINTAINER:
# java@gentoo.org
# @AUTHOR:
# kiorky (kiorky@cryptelium.net), Petteri Räty (betelgeuse@gentoo.org)
# @BLURB: eclass for ant based Java packages
# @DESCRIPTION:
# Eclass for Ant-based Java packages. Provides support for both automatic and
# manual manipulation of build.xml files. Should be inherited after java-pkg-2
# or java-pkg-opt-2 eclass.
inherit java-utils-2 multilib inherit java-utils-2 multilib
@ -22,22 +33,30 @@ inherit java-utils-2 multilib
# ant to build. In particular, it will attempt to fix build.xml files, so that # ant to build. In particular, it will attempt to fix build.xml files, so that
# they use the appropriate 'target' and 'source' attributes. # they use the appropriate 'target' and 'source' attributes.
# ----------------------------------------------------------------------------- # @ECLASS-VARIABLE: WANT_ANT_TASKS
# @variable-preinherit WANT_ANT_TASKS # @DEFAULT_UNSET
# @variable-default "" # @DESCRIPTION:
# An $IFS separated list of ant tasks.
# Ebuild can specify this variable before inheriting java-ant-2 eclass to
# determine ANT_TASKS it needs. They will be automatically translated to
# DEPEND variable and ANT_TASKS variable. JAVA_PKG_FORCE_ANT_TASKS can override
# ANT_TASKS set by WANT_ANT_TASKS, but not the DEPEND due to caching.
# Ebuilds that need to depend conditionally on certain tasks and specify them
# differently for different eant calls can't use this simplified approach.
# You also cannot specify version or anything else than ant-*.
# #
# Please see the description in java-utils-2.eclass. # @CODE
# WANT_ANT_TASKS="ant-junit ant-trax"
# @CODE
#The implementation of dependencies is handled by java-utils-2.eclass
#WANT_ANT_TASKS #WANT_ANT_TASKS
# ----------------------------------------------------------------------------- # @ECLASS-VARIABLE: JAVA_ANT_DISABLE_ANT_CORE_DEP
# @variable-preinherit JAVA_ANT_DISABLE_ANT_CORE_DEP # @DEFAULT_UNSET
# @variable-default unset for java-pkg-2, true for java-pkg-opt-2 # @DESCRIPTION:
#
# Setting this variable non-empty before inheriting java-ant-2 disables adding # Setting this variable non-empty before inheriting java-ant-2 disables adding
# dev-java/ant-core into DEPEND. # dev-java/ant-core into DEPEND.
# construct ant-speficic DEPEND
# add ant-core into DEPEND, unless disabled
if [[ -z "${JAVA_ANT_DISABLE_ANT_CORE_DEP}" ]]; then if [[ -z "${JAVA_ANT_DISABLE_ANT_CORE_DEP}" ]]; then
JAVA_ANT_E_DEPEND="${JAVA_ANT_E_DEPEND} >=dev-java/ant-core-1.8.2" JAVA_ANT_E_DEPEND="${JAVA_ANT_E_DEPEND} >=dev-java/ant-core-1.8.2"
fi fi
@ -70,79 +89,50 @@ fi
DEPEND="${JAVA_ANT_E_DEPEND}" DEPEND="${JAVA_ANT_E_DEPEND}"
# ------------------------------------------------------------------------------ # @ECLASS-VARIABLE: JAVA_PKG_BSFIX
# @global JAVA_PKG_BSFIX # @DESCRIPTION:
#
# Should we attempt to 'fix' ant build files to include the source/target # Should we attempt to 'fix' ant build files to include the source/target
# attributes when calling javac? # attributes when calling javac?
#
# default: on
# ------------------------------------------------------------------------------
JAVA_PKG_BSFIX=${JAVA_PKG_BSFIX:-"on"} JAVA_PKG_BSFIX=${JAVA_PKG_BSFIX:-"on"}
# ------------------------------------------------------------------------------ # @ECLASS-VARIABLE: JAVA_PKG_BSFIX_ALL
# @global JAVA_PKG_BSFIX_ALL # @DESCRIPTION:
#
# If we're fixing build files, should we try to fix all the ones we can find? # If we're fixing build files, should we try to fix all the ones we can find?
#
# default: yes
# ------------------------------------------------------------------------------
JAVA_PKG_BSFIX_ALL=${JAVA_PKG_BSFIX_ALL:-"yes"} JAVA_PKG_BSFIX_ALL=${JAVA_PKG_BSFIX_ALL:-"yes"}
# ------------------------------------------------------------------------------ # @ECLASS-VARIABLE: JAVA_PKG_BSFIX_NAME
# @global JAVA_PKG_BSFIX_NAME # @DESCRIPTION:
#
# Filename of build files to fix/search for # Filename of build files to fix/search for
#
# default: build.xml
# ------------------------------------------------------------------------------
JAVA_PKG_BSFIX_NAME=${JAVA_PKG_BSFIX_NAME:-"build.xml"} JAVA_PKG_BSFIX_NAME=${JAVA_PKG_BSFIX_NAME:-"build.xml"}
# ------------------------------------------------------------------------------ # @ECLASS-VARIABLE: JAVA_PKG_BSFIX_TARGET_TAGS
# @global JAVA_PKG_BSFIX_TARGETS_TAGS # @DESCRIPTION:
#
# Targets to fix the 'source' attribute in # Targets to fix the 'source' attribute in
#
# default: javac xjavac javac.preset
# ------------------------------------------------------------------------------
JAVA_PKG_BSFIX_TARGET_TAGS=${JAVA_PKG_BSFIX_TARGET_TAGS:-"javac xjavac javac.preset"} JAVA_PKG_BSFIX_TARGET_TAGS=${JAVA_PKG_BSFIX_TARGET_TAGS:-"javac xjavac javac.preset"}
# ------------------------------------------------------------------------------ # @ECLASS-VARIABLE: JAVA_PKG_BSFIX_SOURCE_TAGS
# @global JAVA_PKG_BSFIX_SOURCE_TAGS # @DESCRIPTION:
#
# Targets to fix the 'target' attribute in # Targets to fix the 'target' attribute in
#
# default: javacdoc javac xjavac javac.preset
# ------------------------------------------------------------------------------
JAVA_PKG_BSFIX_SOURCE_TAGS=${JAVA_PKG_BSFIX_SOURCE_TAGS:-"javadoc javac xjavac javac.preset"} JAVA_PKG_BSFIX_SOURCE_TAGS=${JAVA_PKG_BSFIX_SOURCE_TAGS:-"javadoc javac xjavac javac.preset"}
# ------------------------------------------------------------------------------ # @ECLASS-VARIABLE: JAVA_ANT_CLASSPATH_TAGS
# @global JAVA_ANT_CLASSPATH_TAGS # @DESCRIPTION:
#
# Targets to add the classpath attribute to # Targets to add the classpath attribute to
#
# default: javac xjavac
# ------------------------------------------------------------------------------
JAVA_ANT_CLASSPATH_TAGS="javac xjavac" JAVA_ANT_CLASSPATH_TAGS="javac xjavac"
# ------------------------------------------------------------------------------ # @ECLASS-VARIABLE: JAVA_ANT_IGNORE_SYSTEM_CLASSES
# @global JAVA_ANT_IGNORE_SYSTEM_CLASSES # @DEFAULT_UNSET
# # @DESCRIPTION:
# Rewrites available tasks to ignore ant classpath. # When set, <available> Ant tasks are rewritten to ignore Ant's runtime classpath.
#
# default: off
# ------------------------------------------------------------------------------
case "${EAPI:-0}" in case "${EAPI:-0}" in
0|1) : ;; 0|1) : ;;
*) EXPORT_FUNCTIONS src_configure ;; *) EXPORT_FUNCTIONS src_configure ;;
esac esac
# ------------------------------------------------------------------------------ # @FUNCTION: java-ant-2_src_configure
# @eclass-src_configure # @DESCRIPTION:
# # src_configure rewrites the build.xml files automatically, unless EAPI is undefined, 0 or 1.
# src_configure rewrites the build.xml files
# ------------------------------------------------------------------------------
java-ant-2_src_configure() { java-ant-2_src_configure() {
# if java support is optional, don't perform this when the USE flag is off # if java support is optional, don't perform this when the USE flag is off
if has java-pkg-opt-2 ${INHERITED}; then if has java-pkg-opt-2 ${INHERITED}; then
@ -159,15 +149,17 @@ java-ant-2_src_configure() {
touch "${T}/java-ant-2_src_configure-run" touch "${T}/java-ant-2_src_configure-run"
} }
# ------------------------------------------------------------------------------ # @FUNCTION: java-ant_bsfix
# @private java-ant_bsfix # @INTERNAL
# @DESCRIPTION:
# Attempts to fix build files.
# #
# Attempts to fix build files. The following variables will affect its behavior # @CODE
# as listed above: # Affected by variables:
# JAVA_PKG_BSFIX # JAVA_PKG_BSFIX
# JAVA_PKG_BSFIX_ALL # JAVA_PKG_BSFIX_ALL
# JAVA_PKG_BSFIX_NAME, # JAVA_PKG_BSFIX_NAME,
# ------------------------------------------------------------------------------ # @CODE
java-ant_bsfix() { java-ant_bsfix() {
debug-print-function ${FUNCNAME} $* debug-print-function ${FUNCNAME} $*
@ -210,11 +202,13 @@ _bsfix_die() {
fi fi
} }
# ------------------------------------------------------------------------------ # @FUNCTION: java-ant_bsfix_files
# @public java-ant_bsfix_files # @USAGE: <path/to/first/build.xml> [path/to/second.build.xml ...]
# @DESCRIPTION:
# Attempts to fix named build files.
# #
# Attempts to fix named build files. The following variables will affect its behavior # @CODE
# as listed above: # Affected by variables:
# JAVA_PKG_BSFIX_SOURCE_TAGS # JAVA_PKG_BSFIX_SOURCE_TAGS
# JAVA_PKG_BSFIX_TARGET_TAGS # JAVA_PKG_BSFIX_TARGET_TAGS
# JAVA_ANT_REWRITE_CLASSPATH # JAVA_ANT_REWRITE_CLASSPATH
@ -223,6 +217,7 @@ _bsfix_die() {
# directories # directories
# JAVA_ANT_BSFIX_EXTRA_ARGS: You can use this to pass extra variables to the # JAVA_ANT_BSFIX_EXTRA_ARGS: You can use this to pass extra variables to the
# rewriter if you know what you are doing. # rewriter if you know what you are doing.
# @CODE
# #
# If JAVA_ANT_JAVADOC_INPUT_DIRS is set, we will turn on the adding of a basic # If JAVA_ANT_JAVADOC_INPUT_DIRS is set, we will turn on the adding of a basic
# javadoc target to the ant's build.xml with the javadoc xml-rewriter feature. # javadoc target to the ant's build.xml with the javadoc xml-rewriter feature.
@ -232,7 +227,6 @@ _bsfix_die() {
# When changing this function, make sure that it works with paths with spaces in # When changing this function, make sure that it works with paths with spaces in
# them. # them.
# ------------------------------------------------------------------------------
java-ant_bsfix_files() { java-ant_bsfix_files() {
debug-print-function ${FUNCNAME} $* debug-print-function ${FUNCNAME} $*
@ -374,14 +368,16 @@ java-ant_bsfix_files() {
} }
# ------------------------------------------------------------------------------ # @FUNCTION: java-ant_bsfix_one
# @public java-ant_bsfix_one # @USAGE: <path/to/build.xml>
# # @DESCRIPTION:
# Attempts to fix named build file. The following variables will affect its behavior # Attempts to fix named build file.
# as listed above: #
# @CODE
# Affected by variables:
# JAVA_PKG_BSFIX_SOURCE_TAGS # JAVA_PKG_BSFIX_SOURCE_TAGS
# JAVA_PKG_BSFIX_TARGET_TAGS # JAVA_PKG_BSFIX_TARGET_TAGS
# ------------------------------------------------------------------------------ # @CODE
java-ant_bsfix_one() { java-ant_bsfix_one() {
debug-print-function ${FUNCNAME} $* debug-print-function ${FUNCNAME} $*
@ -393,14 +389,15 @@ java-ant_bsfix_one() {
java-ant_bsfix_files "${1}" java-ant_bsfix_files "${1}"
} }
# ------------------------------------------------------------------------------ # @FUNCTION: java-ant_rewrite-classpath
# @public java-ant_rewrite-classpath # @USAGE: [path/to/build.xml]
# # @DESCRIPTION:
# Adds 'classpath="${gentoo.classpath}"' to specified build file. # Adds 'classpath="${gentoo.classpath}"' to specified build file.
#
# Affected by: # Affected by:
# JAVA_ANT_CLASSPATH_TAGS # JAVA_ANT_CLASSPATH_TAGS
# @param $1 - the file to rewrite (defaults to build.xml) #
# ------------------------------------------------------------------------------ # Parameter defaults to build.xml when not specified
java-ant_rewrite-classpath() { java-ant_rewrite-classpath() {
debug-print-function ${FUNCNAME} $* debug-print-function ${FUNCNAME} $*
@ -423,14 +420,13 @@ java-ant_rewrite-classpath() {
fi fi
} }
# ------------------------------------------------------------------------------ # @FUNCTION: java-ant_remove-taskdefs
# @public java-ant_remove-taskdefs # @USAGE: [--name NAME] [path/to/build.xml]
# # @DESCRIPTION:
# Removes (named) taskdef elements from the file. # Removes (named) taskdef elements from the build.xml file.
# Options: # When --name NAME is specified, only remove taskdef with name NAME. Otherwise,
# --name NAME : only remove taskdef with name NAME. # all taskdefs are removed.
# @param $1 - the file to rewrite (defaults to build.xml) # The file to rewrite defaults to build.xml when not specified.
# ------------------------------------------------------------------------------
java-ant_remove-taskdefs() { java-ant_remove-taskdefs() {
debug-print-function ${FUNCNAME} $* debug-print-function ${FUNCNAME} $*
local task_name local task_name
@ -455,12 +451,11 @@ EOF
[[ $? != 0 ]] && die "Removing taskdefs failed" [[ $? != 0 ]] && die "Removing taskdefs failed"
} }
# ------------------------------------------------------------------------------ # @FUNCTION: java-ant_ignore-system-classes
# @public java-ant_ignore-system-classes # @USAGE: [path/to/build.xml]
# # @DESCRIPTION:
# Makes the available task ignore classes in the system classpath # Makes the available task ignore classes in the system classpath
# @param $1 - the file to rewrite (defaults to build.xml) # Parameter defaults to build.xml when not specified
# ------------------------------------------------------------------------------
java-ant_ignore-system-classes() { java-ant_ignore-system-classes() {
debug-print-function ${FUNCNAME} $* debug-print-function ${FUNCNAME} $*
local file=${1:-build.xml} local file=${1:-build.xml}
@ -469,10 +464,10 @@ java-ant_ignore-system-classes() {
-e available -a ignoresystemclasses -v "true" -e available -a ignoresystemclasses -v "true"
} }
# ------------------------------------------------------------------------------ # @FUNCTION: java-ant_xml-rewrite
# @public java-ant_xml-rewrite # @USAGE: <xml rewriter arguments>
# @DESCRIPTION:
# Run the right xml-rewrite binary with the given arguments # Run the right xml-rewrite binary with the given arguments
# ------------------------------------------------------------------------------
java-ant_xml-rewrite() { java-ant_xml-rewrite() {
local gen2="/usr/bin/xml-rewrite-2.py" local gen2="/usr/bin/xml-rewrite-2.py"
local gen2_1="/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-2.py" local gen2_1="/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-2.py"
@ -488,22 +483,23 @@ java-ant_xml-rewrite() {
fi fi
} }
# ------------------------------------------------------------------------------ # @FUNCTION: java-ant_rewrite-bootclasspath
# @public java-ant_rewrite-bootclasspath # @USAGE: <version> [path/to/build.xml] [prepend] [append]
# # @DESCRIPTION:
# Adds bootclasspath to javac-like tasks in build.xml filled with jars of a # Adds bootclasspath to javac-like tasks in build.xml filled with jars of a
# bootclasspath package of given version. # bootclasspath package of given version.
# #
# @CODE
# Affected by: # Affected by:
# JAVA_PKG_BSFIX_TARGET_TAGS - the tags of javac tasks # JAVA_PKG_BSFIX_TARGET_TAGS - the tags of javac tasks
# #
# @param $1 - the version of bootclasspath (e.g. 1.5), 'auto' for bootclasspath # Parameters:
# of the current JDK # $1 - the version of bootclasspath (e.g. 1.5), 'auto' for bootclasspath
# @param $2 - path to desired build.xml file, defaults to 'build.xml' # of the current JDK
# @param $3 - (optional) what to prepend the bootclasspath with (to override) # $2 - path to desired build.xml file, defaults to 'build.xml'
# @param $4 - (optional) what to append to the bootclasspath # $3 - (optional) what to prepend the bootclasspath with (to override)
# ------------------------------------------------------------------------------ # $4 - (optional) what to append to the bootclasspath
# @CODE
java-ant_rewrite-bootclasspath() { java-ant_rewrite-bootclasspath() {
local version="${1}" local version="${1}"
local file="${2-build.xml}" local file="${2-build.xml}"

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.288 2013/09/05 17:04:26 tomwij Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.289 2013/11/02 12:58:50 tomwij Exp $
# Description: kernel.eclass rewrite for a clean base regarding the 2.6 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
# series of kernel with back-compatibility for 2.4 # series of kernel with back-compatibility for 2.4
@ -938,7 +938,7 @@ unipatch() {
xz) PIPE_CMD="xz -dc";; xz) PIPE_CMD="xz -dc";;
lzma) PIPE_CMD="lzma -dc";; lzma) PIPE_CMD="lzma -dc";;
bz2) PIPE_CMD="bzip2 -dc";; bz2) PIPE_CMD="bzip2 -dc";;
patch) PIPE_CMD="cat";; patch*) PIPE_CMD="cat";;
diff) PIPE_CMD="cat";; diff) PIPE_CMD="cat";;
gz|Z|z) PIPE_CMD="gzip -dc";; gz|Z|z) PIPE_CMD="gzip -dc";;
ZIP|zip) PIPE_CMD="unzip -p";; ZIP|zip) PIPE_CMD="unzip -p";;

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/leechcraft.eclass,v 1.10 2013/05/08 10:25:48 pinkbyte Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/leechcraft.eclass,v 1.12 2013/09/24 15:39:43 maksbotan Exp $
# #
# @ECLASS: leechcraft.eclass # @ECLASS: leechcraft.eclass
# @MAINTAINER: # @MAINTAINER:
@ -36,7 +36,8 @@ if [[ ${PV} == 9999 ]]; then
inherit git-2 inherit git-2
else else
DEPEND="app-arch/xz-utils" DEPEND="app-arch/xz-utils"
SRC_URI="mirror://sourceforge/leechcraft/leechcraft-${PV}.tar.xz" SRC_URI="mirror://sourceforge/leechcraft/leechcraft-${PV}.tar.xz
http://dist.leechcraft.org/LeechCraft/${PV}/leechcraft-${PV}.tar.xz"
S="${WORKDIR}/leechcraft-${PV}" S="${WORKDIR}/leechcraft-${PV}"
fi fi

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.100 2013/02/10 07:53:31 vapier Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.102 2013/09/29 02:49:40 vapier Exp $
# @ECLASS: linux-info.eclass # @ECLASS: linux-info.eclass
# @MAINTAINER: # @MAINTAINER:
@ -429,7 +429,7 @@ get_version_warning_done=
# KBUILD_OUTPUT (in a decreasing priority list, we look for the env var, makefile var or the # KBUILD_OUTPUT (in a decreasing priority list, we look for the env var, makefile var or the
# symlink /lib/modules/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}/build). # symlink /lib/modules/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}/build).
get_version() { get_version() {
local kbuild_output mkfunc tmplocal local tmplocal
# no need to execute this twice assuming KV_FULL is populated. # no need to execute this twice assuming KV_FULL is populated.
# we can force by unsetting KV_FULL # we can force by unsetting KV_FULL
@ -493,20 +493,24 @@ get_version() {
# keep track of it # keep track of it
KERNEL_MAKEFILE="${KV_DIR}/Makefile" KERNEL_MAKEFILE="${KV_DIR}/Makefile"
# Decide the function used to extract makefile variables. if [[ -z ${OUTPUT_DIR} ]]; then
mkfunc="$(get_makefile_extract_function "${KERNEL_MAKEFILE}")" # Decide the function used to extract makefile variables.
local mkfunc=$(get_makefile_extract_function "${KERNEL_MAKEFILE}")
# And if we didn't pass it, we can take a nosey in the Makefile # And if we didn't pass it, we can take a nosey in the Makefile.
kbuild_output="$(${mkfunc} KBUILD_OUTPUT ${KERNEL_MAKEFILE})" OUTPUT_DIR=$(${mkfunc} KBUILD_OUTPUT "${KERNEL_MAKEFILE}")
OUTPUT_DIR="${OUTPUT_DIR:-${kbuild_output}}" fi
# And contrary to existing functions I feel we shouldn't trust the # And contrary to existing functions I feel we shouldn't trust the
# directory name to find version information as this seems insane. # directory name to find version information as this seems insane.
# so we parse ${KERNEL_MAKEFILE} # So we parse ${KERNEL_MAKEFILE}. We should be able to trust that
KV_MAJOR="$(${mkfunc} VERSION ${KERNEL_MAKEFILE})" # the Makefile is simple enough to use the noexec extract function.
KV_MINOR="$(${mkfunc} PATCHLEVEL ${KERNEL_MAKEFILE})" # This has been true for every release thus far, and it's faster
KV_PATCH="$(${mkfunc} SUBLEVEL ${KERNEL_MAKEFILE})" # than using make to evaluate the Makefile every time.
KV_EXTRA="$(${mkfunc} EXTRAVERSION ${KERNEL_MAKEFILE})" KV_MAJOR=$(getfilevar_noexec VERSION "${KERNEL_MAKEFILE}")
KV_MINOR=$(getfilevar_noexec PATCHLEVEL "${KERNEL_MAKEFILE}")
KV_PATCH=$(getfilevar_noexec SUBLEVEL "${KERNEL_MAKEFILE}")
KV_EXTRA=$(getfilevar_noexec EXTRAVERSION "${KERNEL_MAKEFILE}")
if [ -z "${KV_MAJOR}" -o -z "${KV_MINOR}" -o -z "${KV_PATCH}" ] if [ -z "${KV_MAJOR}" -o -z "${KV_MINOR}" -o -z "${KV_PATCH}" ]
then then

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/mercurial.eclass,v 1.22 2013/04/28 16:15:33 zmedico Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/mercurial.eclass,v 1.23 2013/11/04 22:05:31 floppym Exp $
# @ECLASS: mercurial.eclass # @ECLASS: mercurial.eclass
# @MAINTAINER: # @MAINTAINER:
@ -85,7 +85,7 @@ mercurial_fetch() {
EHG_REPO_URI=${1-${EHG_REPO_URI}} EHG_REPO_URI=${1-${EHG_REPO_URI}}
[[ -z "${EHG_REPO_URI}" ]] && die "EHG_REPO_URI is empty" [[ -z "${EHG_REPO_URI}" ]] && die "EHG_REPO_URI is empty"
local cert_opt= local cert_opt=()
[[ -f ${EPREFIX}/etc/ssl/certs/ca-certificates.crt ]] && \ [[ -f ${EPREFIX}/etc/ssl/certs/ca-certificates.crt ]] && \
cert_opt=( --config "web.cacerts=${EPREFIX}/etc/ssl/certs/ca-certificates.crt" ) cert_opt=( --config "web.cacerts=${EPREFIX}/etc/ssl/certs/ca-certificates.crt" )

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/multibuild.eclass,v 1.13 2013/09/10 09:10:22 mgorny Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/multibuild.eclass,v 1.14 2013/09/18 08:49:33 mgorny Exp $
# @ECLASS: multibuild # @ECLASS: multibuild
# @MAINTAINER: # @MAINTAINER:
@ -28,7 +28,7 @@ if [[ ! ${_MULTIBUILD} ]]; then
inherit multiprocessing inherit multiprocessing
RDEPEND="userland_GNU? ( >=sys-apps/coreutils-8.5 )" DEPEND="userland_GNU? ( >=sys-apps/coreutils-8.5 )"
# @ECLASS-VARIABLE: MULTIBUILD_VARIANTS # @ECLASS-VARIABLE: MULTIBUILD_VARIANTS
# @DESCRIPTION: # @DESCRIPTION:

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.20 2013/09/17 13:29:19 tommy Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.23 2013/10/01 18:06:06 mgorny Exp $
# @ECLASS: multilib-build.eclass # @ECLASS: multilib-build.eclass
# @MAINTAINER: # @MAINTAINER:
@ -28,13 +28,13 @@ inherit multibuild multilib
# @ECLASS-VARIABLE: _MULTILIB_FLAGS # @ECLASS-VARIABLE: _MULTILIB_FLAGS
# @INTERNAL # @INTERNAL
# @DESCRIPTION: # @DESCRIPTION:
# The list of multilib flags and corresponding ABI values. # The list of multilib flags and corresponding ABI values. If the same
# flag is reused for multiple ABIs (e.g. x86 on Linux&FreeBSD), multiple
# ABIs may be separated by commas.
_MULTILIB_FLAGS=( _MULTILIB_FLAGS=(
abi_x86_32:x86 abi_x86_32:x86,x86_fbsd
abi_x86_64:amd64 abi_x86_64:amd64,amd64_fbsd
abi_x86_x32:x32 abi_x86_x32:x32
abi_x86_32:x86_fbsd
abi_x86_64:amd64_fbsd
abi_mips_n32:n32 abi_mips_n32:n32
abi_mips_n64:n64 abi_mips_n64:n64
abi_mips_o32:o32 abi_mips_o32:o32
@ -75,13 +75,19 @@ multilib_get_enabled_abis() {
local abi i found local abi i found
for abi in "${abis[@]}"; do for abi in "${abis[@]}"; do
for i in "${_MULTILIB_FLAGS[@]}"; do for i in "${_MULTILIB_FLAGS[@]}"; do
local m_abi=${i#*:} local m_abis=${i#*:} m_abi
local m_flag=${i%:*} local m_flag=${i%:*}
if [[ ${m_abi} == ${abi} ]] && use "${m_flag}"; then # split on ,; we can't switch IFS for function scope because
echo "${abi}" # paludis is broken (bug #486592), and switching it locally
found=1 # for the split is more complex than cheating like this
fi for m_abi in ${m_abis//,/ }; do
if [[ ${m_abi} == ${abi} ]] && use "${m_flag}"; then
echo "${abi}"
found=1
break 2
fi
done
done done
done done

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-minimal.eclass,v 1.5 2013/06/28 12:42:48 mgorny Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/multilib-minimal.eclass,v 1.6 2013/10/20 16:27:24 hasufell Exp $
# @ECLASS: multilib-minimal.eclass # @ECLASS: multilib-minimal.eclass
# @MAINTAINER: # @MAINTAINER:
@ -30,7 +30,7 @@ case ${EAPI:-0} in
esac esac
inherit multilib-build inherit eutils multilib-build
EXPORT_FUNCTIONS src_configure src_compile src_test src_install EXPORT_FUNCTIONS src_configure src_compile src_test src_install
@ -104,18 +104,7 @@ multilib-minimal_src_install() {
if declare -f multilib_src_install_all >/dev/null ; then if declare -f multilib_src_install_all >/dev/null ; then
multilib_src_install_all multilib_src_install_all
fi
# this is synced with __eapi4_src_install
if ! declare -p DOCS &>/dev/null ; then
local d
for d in README* ChangeLog AUTHORS NEWS TODO CHANGES \
THANKS BUGS FAQ CREDITS CHANGELOG ; do
[[ -s "${d}" ]] && dodoc "${d}"
done
elif [[ $(declare -p DOCS) == "declare -a "* ]] ; then
dodoc "${DOCS[@]}"
else else
dodoc ${DOCS} einstalldocs
fi fi
} }

View File

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/multiprocessing.eclass,v 1.2 2012/07/30 14:52:18 vapier Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/multiprocessing.eclass,v 1.3 2013/10/12 21:12:48 vapier Exp $
# @ECLASS: multiprocessing.eclass # @ECLASS: multiprocessing.eclass
# @MAINTAINER: # @MAINTAINER:
@ -66,9 +66,12 @@ multijob_init() {
has wait ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" wait " has wait ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" wait "
# Setup a pipe for children to write their pids to when they finish. # Setup a pipe for children to write their pids to when they finish.
# We have to allocate two fd's because POSIX has undefined behavior
# when you open a FIFO for simultaneous read/write. #487056
local pipe="${T}/multijob.pipe" local pipe="${T}/multijob.pipe"
mkfifo "${pipe}" mkfifo -m 600 "${pipe}"
redirect_alloc_fd mj_control_fd "${pipe}" redirect_alloc_fd mj_write_fd "${pipe}"
redirect_alloc_fd mj_read_fd "${pipe}"
rm -f "${pipe}" rm -f "${pipe}"
# See how many children we can fork based on the user's settings. # See how many children we can fork based on the user's settings.
@ -120,7 +123,7 @@ multijob_child_init() {
esac esac
if [[ $# -eq 0 ]] ; then if [[ $# -eq 0 ]] ; then
trap 'echo ${BASHPID} $? >&'${mj_control_fd} EXIT trap 'echo ${BASHPID} $? >&'${mj_write_fd} EXIT
trap 'exit 1' INT TERM trap 'exit 1' INT TERM
else else
local ret local ret
@ -169,7 +172,7 @@ multijob_finish_one() {
[[ $# -eq 0 ]] || die "${FUNCNAME} takes no arguments" [[ $# -eq 0 ]] || die "${FUNCNAME} takes no arguments"
local pid ret local pid ret
read -r -u ${mj_control_fd} pid ret || die read -r -u ${mj_read_fd} pid ret || die
: $(( --mj_num_jobs )) : $(( --mj_num_jobs ))
return ${ret} return ${ret}
} }

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/nvidia-driver.eclass,v 1.22 2013/05/16 14:25:13 jer Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/nvidia-driver.eclass,v 1.23 2013/10/12 15:12:59 jer Exp $
# @ECLASS: nvidia-driver.eclass # @ECLASS: nvidia-driver.eclass
# @MAINTAINER: # @MAINTAINER:
@ -12,10 +12,28 @@
# Provide useful messages for nvidia-drivers based on currently installed Nvidia # Provide useful messages for nvidia-drivers based on currently installed Nvidia
# card. It inherits versionator. # card. It inherits versionator.
inherit versionator inherit readme.gentoo versionator
DEPEND="sys-apps/pciutils" DEPEND="sys-apps/pciutils"
# Variables for readme.gentoo.eclass:
DISABLE_AUTOFORMATTING="yes"
DOC_CONTENTS="You must be in the video group to use the NVIDIA device
For more info, read the docs at
http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6
This ebuild installs a kernel module and X driver. Both must
match explicitly in their version. This means, if you restart
X, you must modprobe -r nvidia before starting it back up
To use the NVIDIA GLX, run \"eselect opengl set nvidia\"
To use the NVIDIA CUDA/OpenCL, run \"eselect opencl set nvidia\"
NVIDIA has requested that any bug reports submitted have the
output of nvidia-bug-report.sh included.
"
# the data below is derived from # the data below is derived from
# http://us.download.nvidia.com/XFree86/Linux-x86_64/319.12/README/supportedchips.html # http://us.download.nvidia.com/XFree86/Linux-x86_64/319.12/README/supportedchips.html

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/python-any-r1.eclass,v 1.13 2013/08/01 12:49:42 mgorny Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/python-any-r1.eclass,v 1.16 2013/10/22 15:16:56 mgorny Exp $
# @ECLASS: python-any-r1 # @ECLASS: python-any-r1
# @MAINTAINER: # @MAINTAINER:
@ -156,6 +156,67 @@ _python_build_set_globals
# python_targets_python2_7(-)?,python_single_target_python2_7(+)? # python_targets_python2_7(-)?,python_single_target_python2_7(+)?
# @CODE # @CODE
# @FUNCTION: python_gen_any_dep
# @USAGE: <dependency-block>
# @DESCRIPTION:
# Generate an any-of dependency that enforces a version match between
# the Python interpreter and Python packages. <dependency-block> needs
# to list one or more dependencies with verbatim '${PYTHON_USEDEP}'
# references (quoted!) that will get expanded inside the function.
#
# This should be used along with an appropriate python_check_deps()
# that checks which of the any-of blocks were matched.
#
# Example use:
# @CODE
# DEPEND="$(python_gen_any_dep '
# dev-python/foo[${PYTHON_USEDEP}]
# || ( dev-python/bar[${PYTHON_USEDEP}]
# dev-python/baz[${PYTHON_USEDEP}] )')"
#
# python_check_deps() {
# has_version "dev-python/foo[${PYTHON_USEDEP}]" \
# && { has_version "dev-python/bar[${PYTHON_USEDEP}]" \
# || has_version "dev-python/baz[${PYTHON_USEDEP}]"; }
# }
# @CODE
#
# Example value:
# @CODE
# || (
# (
# dev-lang/python:2.7
# dev-python/foo[python_targets_python2_7(-)?,python_single_target_python2_7(+)?]
# || ( dev-python/bar[python_targets_python2_7(-)?,python_single_target_python2_7(+)?]
# dev-python/baz[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] )
# )
# (
# dev-lang/python:2.6
# dev-python/foo[python_targets_python2_6(-)?,python_single_target_python2_6(+)?]
# || ( dev-python/bar[python_targets_python2_6(-)?,python_single_target_python2_6(+)?]
# dev-python/baz[python_targets_python2_6(-)?,python_single_target_python2_6(+)?] )
# )
# )
# @CODE
python_gen_any_dep() {
debug-print-function ${FUNCNAME} "${@}"
local depstr=${1}
[[ ${depstr} ]] || die "No dependency string provided"
local PYTHON_PKG_DEP out=
for i in "${_PYTHON_ALL_IMPLS[@]}"; do
has "${i}" "${PYTHON_COMPAT[@]}" || continue
local PYTHON_USEDEP="python_targets_${i}(-),python_single_target_${i}(+)"
python_export "${i}" PYTHON_PKG_DEP
local i_depstr=${depstr//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}}
out="( ${PYTHON_PKG_DEP} ${i_depstr} ) ${out}"
done
echo "|| ( ${out})"
}
# @FUNCTION: _python_EPYTHON_supported # @FUNCTION: _python_EPYTHON_supported
# @USAGE: <epython> # @USAGE: <epython>
# @INTERNAL # @INTERNAL
@ -198,11 +259,13 @@ _python_EPYTHON_supported() {
return 1 return 1
} }
# @FUNCTION: python-any-r1_pkg_setup # @FUNCTION: python_setup
# @DESCRIPTION: # @DESCRIPTION:
# Determine what the best installed (and supported) Python # Determine what the best installed (and supported) Python
# implementation is and set EPYTHON and PYTHON accordingly. # implementation is, and set the Python build environment up for it.
python-any-r1_pkg_setup() { #
# This function will call python_check_deps() if defined.
python_setup() {
debug-print-function ${FUNCNAME} "${@}" debug-print-function ${FUNCNAME} "${@}"
# first, try ${EPYTHON}... maybe it's good enough for us. # first, try ${EPYTHON}... maybe it's good enough for us.
@ -252,5 +315,17 @@ python-any-r1_pkg_setup() {
die "No supported Python implementation installed." die "No supported Python implementation installed."
} }
# @FUNCTION: python-any-r1_pkg_setup
# @DESCRIPTION:
# Runs python_setup during from-source installs.
#
# In a binary package installs is a no-op. If you need Python in pkg_*
# phases of a binary package, call python_setup directly.
python-any-r1_pkg_setup() {
debug-print-function ${FUNCNAME} "${@}"
[[ ${MERGE_TYPE} != binary ]] && python_setup
}
_PYTHON_ANY_R1=1 _PYTHON_ANY_R1=1
fi fi

View File

@ -1,6 +1,12 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.30 2013/07/27 11:17:44 mgorny Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.31 2013/09/29 15:04:51 mgorny Exp $
# @DEAD
# Michał Górny <mgorny@gentoo.org> (29 Sep 2013)
# This eclass has been superseded by distutils-r1 and python-r1 eclasses
# and will be removed on 2013-10-29. Please modify your ebuilds to use
# the new eclasses instead. Bug #450770.
# @ECLASS: python-distutils-ng # @ECLASS: python-distutils-ng
# @MAINTAINER: # @MAINTAINER:

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.61 2013/09/17 13:33:55 mgorny Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.64 2013/10/30 19:14:02 mgorny Exp $
# @ECLASS: python-r1 # @ECLASS: python-r1
# @MAINTAINER: # @MAINTAINER:
@ -122,7 +122,7 @@ fi
# #
# Example value: # Example value:
# @CODE # @CODE
# dev-python/python-exec:= # dev-lang/python-exec:=
# python_targets_python2_6? ( dev-lang/python:2.6[gdbm] ) # python_targets_python2_6? ( dev-lang/python:2.6[gdbm] )
# python_targets_python2_7? ( dev-lang/python:2.7[gdbm] ) # python_targets_python2_7? ( dev-lang/python:2.7[gdbm] )
# @CODE # @CODE
@ -204,11 +204,11 @@ _python_set_globals() {
# 2) python-exec should be built with all targets forced anyway # 2) python-exec should be built with all targets forced anyway
# but if new targets were added, we may need to force a rebuild # but if new targets were added, we may need to force a rebuild
# 3) use whichever python-exec slot installed in EAPI 5. For EAPI 4, # 3) use whichever python-exec slot installed in EAPI 5. For EAPI 4,
# just fix :0 for now since := deps are not supported. # just fix :2 since := deps are not supported.
if [[ ${EAPI} != 4 ]]; then if [[ ${EAPI} != 4 ]]; then
PYTHON_DEPS+="dev-python/python-exec:=[${PYTHON_USEDEP}]" PYTHON_DEPS+="dev-lang/python-exec:=[${PYTHON_USEDEP}]"
else else
PYTHON_DEPS+="dev-python/python-exec:0[${PYTHON_USEDEP}]" PYTHON_DEPS+="dev-lang/python-exec:2[${PYTHON_USEDEP}]"
fi fi
} }
_python_set_globals _python_set_globals
@ -418,7 +418,7 @@ _python_check_USE_PYTHON() {
_PYTHON_USE_PYTHON_CHECKED=1 _PYTHON_USE_PYTHON_CHECKED=1
# python-exec has profile-forced flags. # python-exec has profile-forced flags.
if [[ ${CATEGORY}/${PN} == dev-python/python-exec ]]; then if [[ ${CATEGORY}/${PN} == dev-lang/python-exec ]]; then
return return
fi fi
@ -712,6 +712,21 @@ python_parallel_foreach_impl() {
multibuild_parallel_foreach_variant _python_multibuild_wrapper "${@}" multibuild_parallel_foreach_variant _python_multibuild_wrapper "${@}"
} }
# @FUNCTION: python_setup
# @DESCRIPTION:
# Find the best (most preferred) Python implementation enabled
# and set the Python build environment up for it.
#
# This function needs to be used when Python is being called outside
# of python_foreach_impl calls (e.g. for shared processes like doc
# building). python_foreach_impl sets up the build environment itself.
python_setup() {
debug-print-function ${FUNCNAME} "${@}"
python_export_best
python_wrapper_setup
}
# @FUNCTION: python_export_best # @FUNCTION: python_export_best
# @USAGE: [<variable>...] # @USAGE: [<variable>...]
# @DESCRIPTION: # @DESCRIPTION:

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.21 2013/09/17 13:33:55 mgorny Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.24 2013/10/30 19:14:02 mgorny Exp $
# @ECLASS: python-single-r1 # @ECLASS: python-single-r1
# @MAINTAINER: # @MAINTAINER:
@ -31,12 +31,11 @@
# http://www.gentoo.org/proj/en/Python/python-r1/dev-guide.xml # http://www.gentoo.org/proj/en/Python/python-r1/dev-guide.xml
case "${EAPI:-0}" in case "${EAPI:-0}" in
0|1|2|3|4) 0|1|2|3)
die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
;; ;;
5) 4|5)
# EAPI=5 is required for meaningful USE default deps # EAPI=4 is required for USE default deps on USE_EXPAND flags
# on USE_EXPAND flags
;; ;;
*) *)
die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
@ -110,7 +109,7 @@ fi
# #
# Example value: # Example value:
# @CODE # @CODE
# dev-python/python-exec:0 # dev-lang/python-exec:=
# python_single_target_python2_6? ( dev-lang/python:2.6[gdbm] ) # python_single_target_python2_6? ( dev-lang/python:2.6[gdbm] )
# python_single_target_python2_7? ( dev-lang/python:2.7[gdbm] ) # python_single_target_python2_7? ( dev-lang/python:2.7[gdbm] )
# @CODE # @CODE
@ -194,20 +193,20 @@ _python_single_set_globals() {
# 2) python-exec should be built with all targets forced anyway # 2) python-exec should be built with all targets forced anyway
# but if new targets were added, we may need to force a rebuild # but if new targets were added, we may need to force a rebuild
# 3) use whichever python-exec slot installed in EAPI 5. For EAPI 4, # 3) use whichever python-exec slot installed in EAPI 5. For EAPI 4,
# just fix :0 for now since := deps are not supported. # just fix :2 since := deps are not supported.
if [[ ${EAPI} != 4 ]]; then if [[ ${EAPI} != 4 ]]; then
PYTHON_DEPS+="dev-python/python-exec:=[${PYTHON_USEDEP}]" PYTHON_DEPS+="dev-lang/python-exec:=[${PYTHON_USEDEP}]"
else else
PYTHON_DEPS+="dev-python/python-exec:0[${PYTHON_USEDEP}]" PYTHON_DEPS+="dev-lang/python-exec:2[${PYTHON_USEDEP}]"
fi fi
} }
_python_single_set_globals _python_single_set_globals
# @FUNCTION: python-single-r1_pkg_setup # @FUNCTION: python_setup
# @DESCRIPTION: # @DESCRIPTION:
# Determine what the selected Python implementation is and set EPYTHON # Determine what the selected Python implementation is and set
# and PYTHON accordingly. # the Python build environment up for it.
python-single-r1_pkg_setup() { python_setup() {
debug-print-function ${FUNCNAME} "${@}" debug-print-function ${FUNCNAME} "${@}"
unset EPYTHON unset EPYTHON
@ -251,6 +250,15 @@ python-single-r1_pkg_setup() {
fi fi
} }
# @FUNCTION: python-single-r1_pkg_setup
# @DESCRIPTION:
# Runs python_setup.
python-single-r1_pkg_setup() {
debug-print-function ${FUNCNAME} "${@}"
python_setup
}
# @FUNCTION: python_fix_shebang # @FUNCTION: python_fix_shebang
# @USAGE: <path>... # @USAGE: <path>...
# @DESCRIPTION: # @DESCRIPTION:

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.39 2013/09/17 17:28:04 mgorny Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.45 2013/10/30 19:14:02 mgorny Exp $
# @ECLASS: python-utils-r1 # @ECLASS: python-utils-r1
# @MAINTAINER: # @MAINTAINER:
@ -21,7 +21,6 @@
case "${EAPI:-0}" in case "${EAPI:-0}" in
0|1|2|3|4|5) 0|1|2|3|4|5)
# EAPI=4 makes die behavior clear
;; ;;
*) *)
die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
@ -350,19 +349,24 @@ python_export() {
PYTHON_PKG_DEP) PYTHON_PKG_DEP)
local d local d
case ${impl} in case ${impl} in
python*) python2.6)
PYTHON_PKG_DEP='dev-lang/python';; PYTHON_PKG_DEP='>=dev-lang/python-2.6.8-r3:2.6';;
jython*) python2.7)
PYTHON_PKG_DEP='dev-java/jython';; PYTHON_PKG_DEP='>=dev-lang/python-2.7.5-r2:2.7';;
pypy*) python3.2)
PYTHON_PKG_DEP='virtual/pypy';; PYTHON_PKG_DEP='>=dev-lang/python-3.2.5-r2:3.2';;
python3.3)
PYTHON_PKG_DEP='>=dev-lang/python-3.3.2-r2:3.3';;
pypy-c2.0)
PYTHON_PKG_DEP='>=virtual/pypy-2.0.2:2.0';;
jython2.5)
PYTHON_PKG_DEP='>=dev-java/jython-2.5.3-r2:2.5';;
jython2.7)
PYTHON_PKG_DEP='dev-java/jython:2.7';;
*) *)
die "Invalid implementation: ${impl}" die "Invalid implementation: ${impl}"
esac esac
# slot
PYTHON_PKG_DEP+=:${impl##*[a-z-]}
# use-dep # use-dep
if [[ ${PYTHON_REQ_USE} ]]; then if [[ ${PYTHON_REQ_USE} ]]; then
PYTHON_PKG_DEP+=[${PYTHON_REQ_USE}] PYTHON_PKG_DEP+=[${PYTHON_REQ_USE}]
@ -382,44 +386,6 @@ python_export() {
done done
} }
# @FUNCTION: python_get_PYTHON
# @USAGE: [<impl>]
# @DESCRIPTION:
# Obtain and print the path to the Python interpreter for the given
# implementation. If no implementation is provided, ${EPYTHON} will
# be used.
#
# If you just need to have PYTHON set (and exported), then it is better
# to use python_export() directly instead.
python_get_PYTHON() {
debug-print-function ${FUNCNAME} "${@}"
eqawarn '$(python_get_PYTHON) is discouraged since all standard environments' >&2
eqawarn 'have PYTHON exported anyway. Please use ${PYTHON} instead.' >&2
eqawarn 'python_get_PYTHON will be removed on 2013-10-16.' >&2
python_export "${@}" PYTHON
echo "${PYTHON}"
}
# @FUNCTION: python_get_EPYTHON
# @USAGE: <impl>
# @DESCRIPTION:
# Obtain and print the EPYTHON value for the given implementation.
#
# If you just need to have EPYTHON set (and exported), then it is better
# to use python_export() directly instead.
python_get_EPYTHON() {
debug-print-function ${FUNCNAME} "${@}"
eqawarn '$(python_get_EPYTHON) is discouraged since all standard environments' >&2
eqawarn 'have EPYTHON exported anyway. Please use ${EPYTHON} instead.' >&2
eqawarn 'python_get_EPYTHON will be removed on 2013-10-16.' >&2
python_export "${@}" EPYTHON
echo "${EPYTHON}"
}
# @FUNCTION: python_get_sitedir # @FUNCTION: python_get_sitedir
# @USAGE: [<impl>] # @USAGE: [<impl>]
# @DESCRIPTION: # @DESCRIPTION:
@ -596,7 +562,7 @@ _python_ln_rel() {
local tgpath=${target%/*}/ local tgpath=${target%/*}/
local sympath=${symname%/*}/ local sympath=${symname%/*}/
local rel_path= local rel_target=
while [[ ${sympath} ]]; do while [[ ${sympath} ]]; do
local tgseg= symseg= local tgseg= symseg=
@ -1010,12 +976,12 @@ python_is_python3() {
_python_want_python_exec2() { _python_want_python_exec2() {
debug-print-function ${FUNCNAME} "${@}" debug-print-function ${FUNCNAME} "${@}"
# EAPI 4 lacks slot operators, so just fix it on python-exec:0. # EAPI 4 lacks slot operators, so just fix it on python-exec:2.
[[ ${EAPI} == 4 ]] && return 1 [[ ${EAPI} == 4 ]] && return 0
# Check if we cached the result, or someone put an override. # Check if we cached the result, or someone put an override.
if [[ ! ${_PYTHON_WANT_PYTHON_EXEC2+1} ]]; then if [[ ! ${_PYTHON_WANT_PYTHON_EXEC2+1} ]]; then
has_version 'dev-python/python-exec:2' has_version 'dev-lang/python-exec:2'
_PYTHON_WANT_PYTHON_EXEC2=$(( ! ${?} )) _PYTHON_WANT_PYTHON_EXEC2=$(( ! ${?} ))
fi fi

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.167 2013/07/27 11:17:44 mgorny Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.168 2013/09/18 18:47:59 mgorny Exp $
# @ECLASS: python.eclass # @ECLASS: python.eclass
# @MAINTAINER: # @MAINTAINER:
@ -31,6 +31,9 @@ if ! has "${EAPI:-0}" 0 1 2 3 4 5; then
die "API of python.eclass in EAPI=\"${EAPI}\" not established" die "API of python.eclass in EAPI=\"${EAPI}\" not established"
fi fi
# Please do not add any new versions of Python here! Instead, please
# focus on converting packages to use the new eclasses.
_CPYTHON2_GLOBALLY_SUPPORTED_ABIS=(2.4 2.5 2.6 2.7) _CPYTHON2_GLOBALLY_SUPPORTED_ABIS=(2.4 2.5 2.6 2.7)
_CPYTHON3_GLOBALLY_SUPPORTED_ABIS=(3.1 3.2 3.3) _CPYTHON3_GLOBALLY_SUPPORTED_ABIS=(3.1 3.2 3.3)
_JYTHON_GLOBALLY_SUPPORTED_ABIS=(2.5-jython 2.7-jython) _JYTHON_GLOBALLY_SUPPORTED_ABIS=(2.5-jython 2.7-jython)

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.150 2013/08/13 10:17:54 pesa Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.153 2013/10/20 21:45:31 pesa Exp $
# @ECLASS: qt4-build.eclass # @ECLASS: qt4-build.eclass
# @MAINTAINER: # @MAINTAINER:
@ -18,7 +18,7 @@ inherit eutils flag-o-matic multilib toolchain-funcs versionator
if [[ ${PV} == *9999* ]]; then if [[ ${PV} == *9999* ]]; then
QT4_BUILD_TYPE="live" QT4_BUILD_TYPE="live"
inherit git-2 inherit git-r3
else else
QT4_BUILD_TYPE="release" QT4_BUILD_TYPE="release"
fi fi
@ -31,8 +31,10 @@ MY_P=qt-everywhere-opensource-src-${MY_PV}
case ${QT4_BUILD_TYPE} in case ${QT4_BUILD_TYPE} in
live) live)
EGIT_REPO_URI="git://gitorious.org/qt/qt.git EGIT_REPO_URI=(
https://git.gitorious.org/qt/qt.git" "git://gitorious.org/qt/qt.git"
"https://git.gitorious.org/qt/qt.git"
)
EGIT_BRANCH=${PV%.9999} EGIT_BRANCH=${PV%.9999}
;; ;;
release) release)
@ -41,7 +43,9 @@ case ${QT4_BUILD_TYPE} in
esac esac
IUSE="aqua debug pch" IUSE="aqua debug pch"
[[ ${CATEGORY}/${PN} != dev-qt/qtwebkit ]] && IUSE+=" c++0x" if ! version_is_at_least 4.8.5; then
[[ ${CATEGORY}/${PN} != dev-qt/qtwebkit ]] && IUSE+=" c++0x"
fi
[[ ${CATEGORY}/${PN} != dev-qt/qtxmlpatterns ]] && IUSE+=" +exceptions" [[ ${CATEGORY}/${PN} != dev-qt/qtxmlpatterns ]] && IUSE+=" +exceptions"
DEPEND="virtual/pkgconfig" DEPEND="virtual/pkgconfig"
@ -55,16 +59,12 @@ S=${WORKDIR}/${MY_P}
# @DESCRIPTION: # @DESCRIPTION:
# Sets up PATH and LD_LIBRARY_PATH. # Sets up PATH and LD_LIBRARY_PATH.
qt4-build_pkg_setup() { qt4-build_pkg_setup() {
# Protect users by not allowing downgrades between releases. # Warn users of possible breakage when downgrading to a previous release.
# Downgrading revisions within the same release should be allowed. # Downgrading revisions within the same release is safe.
if has_version ">${CATEGORY}/${P}-r9999:4"; then if has_version ">${CATEGORY}/${P}-r9999:4"; then
if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then ewarn
eerror " *** Sanity check to keep you from breaking your system ***" ewarn "Downgrading Qt is completely unsupported and can break your system!"
eerror "Downgrading Qt is completely unsupported and will break your system!" ewarn
die "aborting to save your system"
else
ewarn "Downgrading Qt is completely unsupported and will break your system!"
fi
fi fi
PATH="${S}/bin${PATH:+:}${PATH}" PATH="${S}/bin${PATH:+:}${PATH}"
@ -99,28 +99,28 @@ qt4-build_pkg_setup() {
qt4-build_src_unpack() { qt4-build_src_unpack() {
setqtenv setqtenv
if ! version_is_at_least 4.1 $(gcc-version); then if ! version_is_at_least 4.4 $(gcc-version); then
ewarn "Using a GCC version lower than 4.1 is not supported." ewarn
elif use_if_iuse c++0x && ! version_is_at_least 4.4 $(gcc-version); then ewarn "Using a GCC version lower than 4.4 is not supported."
ewarn "USE=c++0x requires GCC 4.4 or later." ewarn
fi fi
if [[ ${CATEGORY}/${PN} == dev-qt/qtwebkit ]]; then if [[ ${CATEGORY}/${PN} == dev-qt/qtwebkit ]]; then
eshopts_push -s extglob eshopts_push -s extglob
if is-flagq '-g?(gdb)?([1-9])'; then if is-flagq '-g?(gdb)?([1-9])'; then
echo ewarn
ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)." ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
ewarn "You may experience really long compilation times and/or increased memory usage." ewarn "You may experience really long compilation times and/or increased memory usage."
ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug." ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
ewarn "For more info check out https://bugs.gentoo.org/307861" ewarn "For more info check out https://bugs.gentoo.org/307861"
echo ewarn
fi fi
eshopts_pop eshopts_pop
fi fi
case ${QT4_BUILD_TYPE} in case ${QT4_BUILD_TYPE} in
live) live)
git-2_src_unpack git-r3_src_unpack
;; ;;
release) release)
local tarball="${MY_P}.tar.gz" target= targets= local tarball="${MY_P}.tar.gz" target= targets=
@ -163,7 +163,7 @@ qt4-build_src_prepare() {
fi fi
# avoid X11 dependency in non-gui packages # avoid X11 dependency in non-gui packages
local nolibx11_pkgs="qtcore qtdbus qtscript qtsql qttest qtxmlpatterns" local nolibx11_pkgs="qtbearer qtcore qtdbus qtscript qtsql qttest qtxmlpatterns"
has ${PN} ${nolibx11_pkgs} && qt_nolibx11 has ${PN} ${nolibx11_pkgs} && qt_nolibx11
if use aqua; then if use aqua; then

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.85 2013/07/27 10:18:13 mgorny Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.86 2013/10/17 22:53:59 ottxor Exp $
# @ECLASS: subversion.eclass # @ECLASS: subversion.eclass
# @MAINTAINER: # @MAINTAINER:
@ -443,9 +443,10 @@ subversion_src_prepare() {
# want the logs to stick around if packages are uninstalled without messing with # want the logs to stick around if packages are uninstalled without messing with
# config protection. # config protection.
subversion_pkg_preinst() { subversion_pkg_preinst() {
has "${EAPI:-0}" 0 1 2 && ! use prefix && EROOT="${ROOT}"
local pkgdate=$(date "+%Y%m%d %H:%M:%S") local pkgdate=$(date "+%Y%m%d %H:%M:%S")
if [[ -n ${ESCM_LOGDIR} ]]; then if [[ -n ${ESCM_LOGDIR} ]]; then
local dir="${ROOT}/${ESCM_LOGDIR}/${CATEGORY}" local dir="${EROOT}/${ESCM_LOGDIR}/${CATEGORY}"
if [[ ! -d ${dir} ]]; then if [[ ! -d ${dir} ]]; then
mkdir -p "${dir}" || eerror "Failed to create '${dir}' for logging svn revision" mkdir -p "${dir}" || eerror "Failed to create '${dir}' for logging svn revision"
fi fi

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.30 2013/09/12 11:46:41 mgorny Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.31 2013/10/22 15:14:40 mgorny Exp $
# @ECLASS: systemd.eclass # @ECLASS: systemd.eclass
# @MAINTAINER: # @MAINTAINER:
@ -218,6 +218,53 @@ systemd_enable_service() {
dosym ../"${service}" "${ud}"/"${target}".wants/"${destname}" dosym ../"${service}" "${ud}"/"${target}".wants/"${destname}"
} }
# @FUNCTION: systemd_enable_ntpunit
# @USAGE: <NN-name> <service>...
# @DESCRIPTION:
# Add an NTP service provider to the list of implementations
# in timedated. <NN-name> defines the newly-created ntp-units.d priority
# and name, while the remaining arguments list service units that will
# be added to that file.
#
# Uses doins, thus it is fatal in EAPI 4 and non-fatal in earlier
# EAPIs.
#
# Doc: http://www.freedesktop.org/wiki/Software/systemd/timedated/
systemd_enable_ntpunit() {
debug-print-function ${FUNCNAME} "${@}"
if [[ ${#} -lt 2 ]]; then
die "Usage: systemd_enable_ntpunit <NN-name> <service>..."
fi
local ntpunit_name=${1}
local services=( "${@:2}" )
if [[ ${ntpunit_name} != [0-9][0-9]-* ]]; then
die "ntpunit.d file must be named NN-name where NN are digits."
elif [[ ${ntpunit_name} == *.list ]]; then
die "The .list suffix is appended implicitly to ntpunit.d name."
fi
local unitdir=$(systemd_get_unitdir)
local s
for s in "${services[@]}"; do
if [[ ! -f "${D}${unitdir}/${s}" ]]; then
die "ntp-units.d provider ${s} not installed (yet?) in \${D}."
fi
echo "${s}" >> "${T}"/${ntpunit_name}.list
done
(
insinto "$(_systemd_get_utildir)"/ntp-units.d
doins "${T}"/${ntpunit_name}.list
)
local ret=${?}
rm "${T}"/${ntpunit_name}.list || die
return ${ret}
}
# @FUNCTION: systemd_with_unitdir # @FUNCTION: systemd_with_unitdir
# @USAGE: [<configure-option-name>] # @USAGE: [<configure-option-name>]
# @DESCRIPTION: # @DESCRIPTION:

View File

@ -101,13 +101,13 @@ ftend
tbegin "append-cflags basic" tbegin "append-cflags basic"
CFLAGS= CFLAGS=
append-cflags -O0 append-cflags -O0
[[ ${CFLAGS} == "-O0" ]] [[ ${CFLAGS} == " -O0" ]]
ftend ftend
tbegin "append-cflags -DFOO='a b c'" tbegin "append-cflags -DFOO='a b c'"
CFLAGS= CFLAGS=
append-cflags '-DFOO="a b c"' append-cflags '-DFOO="a b c"'
[[ ${CFLAGS} == '-DFOO="a b c"' ]] [[ ${CFLAGS} == ' -DFOO="a b c"' ]]
ftend ftend
tbegin "raw-ldflags" tbegin "raw-ldflags"

View File

@ -0,0 +1,201 @@
#!/bin/bash
source tests-common.sh
inherit git-r3
testdir=${pkg_root}/git
mkdir "${testdir}" || die "unable to mkdir testdir"
cd "${testdir}" || die "unable to cd to testdir"
EGIT3_STORE_DIR=store
mkdir "${EGIT3_STORE_DIR}" || die "unable to mkdir store"
test_file() {
local fn=${1}
local expect=${2}
if [[ ! -f ${fn} ]]; then
eerror "${fn} does not exist (not checked out?)"
else
local got=$(<"${fn}")
if [[ ${got} != ${expect} ]]; then
eerror "${fn}, expected: ${expect}, got: ${got}"
else
return 0
fi
fi
return 1
}
test_no_file() {
local fn=${1}
if [[ -f ${fn} ]]; then
eerror "${fn} exists (wtf?!)"
else
return 0
fi
return 1
}
test_repo_clean() {
local P=${P}_${FUNCNAME#test_}
(
mkdir repo
cd repo
git init -q
echo test > file
git add file
git commit -m 1 -q
echo other-text > file2
git add file2
git commit -m 2 -q
) || die "unable to prepare repo"
# we need to use an array to preserve whitespace
local EGIT_REPO_URI=(
"ext::git daemon --export-all --base-path=. --inetd %G/repo"
)
tbegin "fetching from a simple repo"
(
git-r3_src_unpack
test_file "${WORKDIR}/${P}/file" test && \
test_file "${WORKDIR}/${P}/file2" other-text
) &>fetch.log
eend ${?} || cat fetch.log
}
test_repo_revert() {
local P=${P}_${FUNCNAME#test_}
(
cd repo
git revert -n HEAD^
git commit -m r1 -q
) || die "unable to prepare repo"
# we need to use an array to preserve whitespace
local EGIT_REPO_URI=(
"ext::git daemon --export-all --base-path=. --inetd %G/repo"
)
tbegin "fetching revert"
(
git-r3_src_unpack
test_no_file "${WORKDIR}/${P}/file" && \
test_file "${WORKDIR}/${P}/file2" other-text
) &>fetch.log
eend ${?} || cat fetch.log
}
test_repo_branch() {
local P=${P}_${FUNCNAME#test_}
(
cd repo
git branch -q other-branch HEAD^
git checkout -q other-branch
echo one-more > file3
git add file3
git commit -m 3 -q
git checkout -q master
) || die "unable to prepare repo"
# we need to use an array to preserve whitespace
local EGIT_REPO_URI=(
"ext::git daemon --export-all --base-path=. --inetd %G/repo"
)
local EGIT_BRANCH=other-branch
tbegin "switching branches"
(
git-r3_src_unpack
test_file "${WORKDIR}/${P}/file" test && \
test_file "${WORKDIR}/${P}/file2" other-text && \
test_file "${WORKDIR}/${P}/file3" one-more
) &>fetch.log
eend ${?} || cat fetch.log
}
test_repo_merge() {
local P=${P}_${FUNCNAME#test_}
(
cd repo
git branch -q one-more-branch HEAD^
git checkout -q one-more-branch
echo foobarbaz > file3
git add file3
git commit -m 3b -q
git checkout -q master
git merge -m 4 -q one-more-branch
) || die "unable to prepare repo"
# we need to use an array to preserve whitespace
local EGIT_REPO_URI=(
"ext::git daemon --export-all --base-path=. --inetd %G/repo"
)
tbegin "fetching a merge commit"
(
git-r3_src_unpack
test_no_file "${WORKDIR}/${P}/file" && \
test_file "${WORKDIR}/${P}/file2" other-text && \
test_file "${WORKDIR}/${P}/file3" foobarbaz
) &>fetch.log
eend ${?} || cat fetch.log
}
test_repo_revert_merge() {
local P=${P}_${FUNCNAME#test_}
(
cd repo
git branch -q to-be-reverted
git checkout -q to-be-reverted
echo trrm > file3
git add file3
git commit -m 5b -q
git checkout -q master
echo trrm > file2
git add file2
git commit -m 5 -q
git merge -m 6 -q to-be-reverted
echo trrm > file
git add file
git commit -m 7 -q
git revert -m 1 -n HEAD^
git commit -m 7r -q
) || die "unable to prepare repo"
# we need to use an array to preserve whitespace
local EGIT_REPO_URI=(
"ext::git daemon --export-all --base-path=. --inetd %G/repo"
)
tbegin "fetching a revert of a merge commit"
(
git-r3_src_unpack
test_file "${WORKDIR}/${P}/file" trrm && \
test_file "${WORKDIR}/${P}/file2" trrm && \
test_file "${WORKDIR}/${P}/file3" foobarbaz
) &>fetch.log
eend ${?} || cat fetch.log
}
test_repo_clean
test_repo_revert
test_repo_branch
test_repo_merge
test_repo_revert_merge
texit

View File

@ -0,0 +1,58 @@
#!/bin/bash
source tests-common.sh
inherit git-r3
testdir=${pkg_root}/git
mkdir "${testdir}" || die "unable to mkdir testdir"
cd "${testdir}" || die "unable to cd to testdir"
EGIT3_STORE_DIR=store
mkdir "${EGIT3_STORE_DIR}" || die "unable to mkdir store"
# Test cleaning up canonical repo URI
test_repouri() {
local uri=${1}
local expect=${2}
local -x GIT_DIR
tbegin "GIT_DIR for ${uri}"
_git-r3_set_gitdir "${uri}" &>/dev/null
local got=${GIT_DIR#${EGIT3_STORE_DIR}/}
[[ ${expect} == ${got} ]]
tend ${?} || eerror "Expected: ${expect}, got: ${got}"
}
test_repouri git://git.overlays.gentoo.org/proj/portage.git proj_portage.git
test_repouri https://git.overlays.gentoo.org/gitroot/proj/portage.git proj_portage.git
test_repouri git+ssh://git@git.overlays.gentoo.org/proj/portage.git proj_portage.git
test_repouri git://anongit.freedesktop.org/mesa/mesa mesa_mesa.git
test_repouri ssh://git.freedesktop.org/git/mesa/mesa mesa_mesa.git
test_repouri http://anongit.freedesktop.org/git/mesa/mesa.git mesa_mesa.git
test_repouri http://cgit.freedesktop.org/mesa/mesa/ mesa_mesa.git
test_repouri https://code.google.com/p/snakeoil/ snakeoil.git
test_repouri git://git.code.sf.net/p/xournal/code xournal_code.git
test_repouri http://git.code.sf.net/p/xournal/code xournal_code.git
test_repouri git://git.gnome.org/glibmm glibmm.git
test_repouri https://git.gnome.org/browse/glibmm glibmm.git
test_repouri ssh://USERNAME@git.gnome.org/git/glibmm glibmm.git
test_repouri git://git.kernel.org/pub/scm/git/git.git git_git.git
test_repouri http://git.kernel.org/pub/scm/git/git.git git_git.git
test_repouri https://git.kernel.org/pub/scm/git/git.git git_git.git
test_repouri https://git.kernel.org/cgit/git/git.git/ git_git.git
#test_repouri git@github.com:gentoo/identity.gentoo.org.git gentoo_identity.gentoo.org.git
test_repouri https://github.com/gentoo/identity.gentoo.org.git gentoo_identity.gentoo.org.git
#test_repouri git@bitbucket.org:mgorny/python-exec.git mgorny_python-exec.git
test_repouri https://mgorny@bitbucket.org/mgorny/python-exec.git mgorny_python-exec.git
texit

View File

@ -37,7 +37,7 @@ test_var PYTHON python2_7 /usr/bin/python2.7
test_var PYTHON_SITEDIR python2_7 /usr/lib/python2.7/site-packages test_var PYTHON_SITEDIR python2_7 /usr/lib/python2.7/site-packages
test_var PYTHON_INCLUDEDIR python2_7 /usr/include/python2.7 test_var PYTHON_INCLUDEDIR python2_7 /usr/include/python2.7
test_var PYTHON_LIBPATH python2_7 /usr/lib/libpython2.7$(get_libname) test_var PYTHON_LIBPATH python2_7 /usr/lib/libpython2.7$(get_libname)
test_var PYTHON_PKG_DEP python2_7 dev-lang/python:2.7 test_var PYTHON_PKG_DEP python2_7 '*dev-lang/python*:2.7'
test_var PYTHON_SCRIPTDIR python2_7 /usr/lib/python-exec/python2.7 test_var PYTHON_SCRIPTDIR python2_7 /usr/lib/python-exec/python2.7
test_var EPYTHON python3_3 python3.3 test_var EPYTHON python3_3 python3.3
@ -45,20 +45,20 @@ test_var PYTHON python3_3 /usr/bin/python3.3
test_var PYTHON_SITEDIR python3_3 /usr/lib/python3.3/site-packages test_var PYTHON_SITEDIR python3_3 /usr/lib/python3.3/site-packages
test_var PYTHON_INCLUDEDIR python3_3 /usr/include/python3.3 test_var PYTHON_INCLUDEDIR python3_3 /usr/include/python3.3
test_var PYTHON_LIBPATH python3_3 /usr/lib/libpython3.3$(get_libname) test_var PYTHON_LIBPATH python3_3 /usr/lib/libpython3.3$(get_libname)
test_var PYTHON_PKG_DEP python3_3 dev-lang/python:3.3 test_var PYTHON_PKG_DEP python3_3 '*dev-lang/python*:3.3'
test_var PYTHON_SCRIPTDIR python3_3 /usr/lib/python-exec/python3.3 test_var PYTHON_SCRIPTDIR python3_3 /usr/lib/python-exec/python3.3
test_var EPYTHON jython2_7 jython2.7 test_var EPYTHON jython2_7 jython2.7
test_var PYTHON jython2_7 /usr/bin/jython2.7 test_var PYTHON jython2_7 /usr/bin/jython2.7
test_var PYTHON_SITEDIR jython2_7 /usr/share/jython-2.7/Lib/site-packages test_var PYTHON_SITEDIR jython2_7 /usr/share/jython-2.7/Lib/site-packages
test_var PYTHON_PKG_DEP jython2_7 dev-java/jython:2.7 test_var PYTHON_PKG_DEP jython2_7 '*dev-java/jython*:2.7'
test_var PYTHON_SCRIPTDIR jython2_7 /usr/lib/python-exec/jython2.7 test_var PYTHON_SCRIPTDIR jython2_7 /usr/lib/python-exec/jython2.7
test_var EPYTHON pypy2_0 pypy-c2.0 test_var EPYTHON pypy2_0 pypy-c2.0
test_var PYTHON pypy2_0 /usr/bin/pypy-c2.0 test_var PYTHON pypy2_0 /usr/bin/pypy-c2.0
test_var PYTHON_SITEDIR pypy2_0 /usr/lib/pypy2.0/site-packages test_var PYTHON_SITEDIR pypy2_0 /usr/lib/pypy2.0/site-packages
test_var PYTHON_INCLUDEDIR pypy2_0 /usr/lib/pypy2.0/include test_var PYTHON_INCLUDEDIR pypy2_0 /usr/lib/pypy2.0/include
test_var PYTHON_PKG_DEP pypy2_0 virtual/pypy:2.0 test_var PYTHON_PKG_DEP pypy2_0 '*virtual/pypy*:2.0'
test_var PYTHON_SCRIPTDIR pypy2_0 /usr/lib/python-exec/pypy-c2.0 test_var PYTHON_SCRIPTDIR pypy2_0 /usr/lib/python-exec/pypy-c2.0
test_is python_is_python3 python2.7 1 test_is python_is_python3 python2.7 1

View File

@ -131,3 +131,4 @@ PN="tests"
PV="0" PV="0"
P="${PN}-${PV}" P="${PN}-${PV}"
PF=${P} PF=${P}
SLOT=0

View File

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/texlive-module.eclass,v 1.66 2013/07/05 22:43:41 aballier Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/texlive-module.eclass,v 1.67 2013/09/25 15:18:28 ottxor Exp $
# @ECLASS: texlive-module.eclass # @ECLASS: texlive-module.eclass
# @MAINTAINER: # @MAINTAINER:
@ -21,7 +21,7 @@
# care of unpacking and relocating the files that need it. # care of unpacking and relocating the files that need it.
# #
# It inherits texlive-common and base for supporting patching via the PATCHES # It inherits texlive-common and base for supporting patching via the PATCHES
# bash array with EAPI>=2. # bash array.
# @ECLASS-VARIABLE: TEXLIVE_MODULE_CONTENTS # @ECLASS-VARIABLE: TEXLIVE_MODULE_CONTENTS
# @DESCRIPTION: # @DESCRIPTION:
@ -63,6 +63,14 @@
inherit texlive-common base inherit texlive-common base
case "${EAPI:-0}" in
0|1|2)
die "EAPI='${EAPI}' is not supported anymore"
;;
*)
;;
esac
HOMEPAGE="http://www.tug.org/texlive/" HOMEPAGE="http://www.tug.org/texlive/"
COMMON_DEPEND=">=app-text/texlive-core-${TL_PV:-${PV}}" COMMON_DEPEND=">=app-text/texlive-core-${TL_PV:-${PV}}"
@ -103,28 +111,12 @@ S="${WORKDIR}"
# @FUNCTION: texlive-module_src_unpack # @FUNCTION: texlive-module_src_unpack
# @DESCRIPTION: # @DESCRIPTION:
# Only for TeX Live 2009 and later. # Only for TeX Live 2009 and later.
# Gives tar.xz unpack support until we can use an EAPI with that support.
# If EAPI supports tar.xz then it calls unpack instead of its own unpacker.
# After unpacking, the files that need to be relocated are moved accordingly. # After unpacking, the files that need to be relocated are moved accordingly.
RELOC_TARGET=texmf-dist RELOC_TARGET=texmf-dist
texlive-module_src_unpack() { texlive-module_src_unpack() {
if has "${EAPI:-0}" 0 1 2 ; then unpack ${A}
local i s
# Avoid installing world writable files
# Bugs #309997, #310039, #338881
umask 022
for i in ${A}
do
s="${DISTDIR%/}/${i}"
einfo "Unpacking ${s} to ${PWD}"
test -s "${s}" || die "${s} does not exist"
xz -dc -- "${s}" | tar xof - || die "Unpacking ${s} failed"
done
else
unpack ${A}
fi
grep RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist" grep RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
{ for i in $(<"${T}/reloclist"); do dirname $i; done; } | uniq > "${T}/dirlist" { for i in $(<"${T}/reloclist"); do dirname $i; done; } | uniq > "${T}/dirlist"
@ -312,15 +304,15 @@ texlive-module_src_install() {
dodir /usr/share dodir /usr/share
if [ -z "${PN##*documentation*}" ] || use doc; then if [ -z "${PN##*documentation*}" ] || use doc; then
[ -d texmf-doc ] && cp -pR texmf-doc "${D}/usr/share/" [ -d texmf-doc ] && cp -pR texmf-doc "${ED}/usr/share/"
else else
[ -d texmf/doc ] && rm -rf texmf/doc [ -d texmf/doc ] && rm -rf texmf/doc
[ -d texmf-dist/doc ] && rm -rf texmf-dist/doc [ -d texmf-dist/doc ] && rm -rf texmf-dist/doc
fi fi
[ -d texmf ] && cp -pR texmf "${D}/usr/share/" [ -d texmf ] && cp -pR texmf "${ED}/usr/share/"
[ -d texmf-dist ] && cp -pR texmf-dist "${D}/usr/share/" [ -d texmf-dist ] && cp -pR texmf-dist "${ED}/usr/share/"
[ -d tlpkg ] && use source && cp -pR tlpkg "${D}/usr/share/" [ -d tlpkg ] && use source && cp -pR tlpkg "${ED}/usr/share/"
insinto /var/lib/texmf insinto /var/lib/texmf
[ -d texmf-var ] && doins -r texmf-var/* [ -d texmf-var ] && doins -r texmf-var/*

View File

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.123 2013/02/09 04:32:48 vapier Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.125 2013/10/11 18:35:59 vapier Exp $
# #
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org> # Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
# #
@ -60,6 +60,9 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
fi fi
is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
: ${ED:=${D}}
: ${EROOT:=${ROOT}}
DESCRIPTION="Tools necessary to build programs" DESCRIPTION="Tools necessary to build programs"
HOMEPAGE="http://sourceware.org/binutils/" HOMEPAGE="http://sourceware.org/binutils/"
@ -262,7 +265,7 @@ toolchain-binutils_src_compile() {
use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd ) use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} ) [[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
is_cross && myconf+=( --with-sysroot=/usr/${CTARGET} ) is_cross && myconf+=( --with-sysroot="${EPREFIX}"/usr/${CTARGET} )
# glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+ # glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+
# on everyone in alpha (for now), we'll just enable it when possible # on everyone in alpha (for now), we'll just enable it when possible
@ -270,16 +273,16 @@ toolchain-binutils_src_compile() {
has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt ) has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt )
myconf+=( myconf+=(
--prefix=/usr --prefix="${EPREFIX}"/usr
--host=${CHOST} --host=${CHOST}
--target=${CTARGET} --target=${CTARGET}
--datadir=${DATAPATH} --datadir="${EPREFIX}"${DATAPATH}
--infodir=${DATAPATH}/info --infodir="${EPREFIX}"${DATAPATH}/info
--mandir=${DATAPATH}/man --mandir="${EPREFIX}"${DATAPATH}/man
--bindir=${BINPATH} --bindir="${EPREFIX}"${BINPATH}
--libdir=${LIBPATH} --libdir="${EPREFIX}"${LIBPATH}
--libexecdir=${LIBPATH} --libexecdir="${EPREFIX}"${LIBPATH}
--includedir=${INCPATH} --includedir="${EPREFIX}"${INCPATH}
--enable-obsolete --enable-obsolete
--enable-shared --enable-shared
--enable-threads --enable-threads
@ -317,7 +320,7 @@ toolchain-binutils_src_compile() {
--with-bfd-include-dir=${MY_BUILDDIR}/bfd --with-bfd-include-dir=${MY_BUILDDIR}/bfd
--with-libbfd=${MY_BUILDDIR}/bfd/libbfd.a --with-libbfd=${MY_BUILDDIR}/bfd/libbfd.a
--with-libiberty=${MY_BUILDDIR}/libiberty/libiberty.a --with-libiberty=${MY_BUILDDIR}/libiberty/libiberty.a
--with-binutils-ldscript-dir=${LIBPATH}/ldscripts --with-binutils-ldscript-dir="${EPREFIX}"${LIBPATH}/ldscripts
) )
echo ./configure "${myconf[@]}" echo ./configure "${myconf[@]}"
./configure "${myconf[@]}" || die ./configure "${myconf[@]}" || die
@ -335,12 +338,12 @@ toolchain-binutils_src_install() {
local x d local x d
cd "${MY_BUILDDIR}" cd "${MY_BUILDDIR}"
emake DESTDIR="${D}" tooldir="${LIBPATH}" install || die emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install || die
rm -rf "${D}"/${LIBPATH}/bin rm -rf "${ED}"/${LIBPATH}/bin
use static-libs || find "${D}" -name '*.la' -delete use static-libs || find "${ED}" -name '*.la' -delete
# Newer versions of binutils get fancy with ${LIBPATH} #171905 # Newer versions of binutils get fancy with ${LIBPATH} #171905
cd "${D}"/${LIBPATH} cd "${ED}"/${LIBPATH}
for d in ../* ; do for d in ../* ; do
[[ ${d} == ../${BVER} ]] && continue [[ ${d} == ../${BVER} ]] && continue
mv ${d}/* . || die mv ${d}/* . || die
@ -351,15 +354,15 @@ toolchain-binutils_src_install() {
# When something is built to cross-compile, it installs into # When something is built to cross-compile, it installs into
# /usr/$CHOST/ by default ... we have to 'fix' that :) # /usr/$CHOST/ by default ... we have to 'fix' that :)
if is_cross ; then if is_cross ; then
cd "${D}"/${BINPATH} cd "${ED}"/${BINPATH}
for x in * ; do for x in * ; do
mv ${x} ${x/${CTARGET}-} mv ${x} ${x/${CTARGET}-}
done done
if [[ -d ${D}/usr/${CHOST}/${CTARGET} ]] ; then if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
mv "${D}"/usr/${CHOST}/${CTARGET}/include "${D}"/${INCPATH} mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
mv "${D}"/usr/${CHOST}/${CTARGET}/lib/* "${D}"/${LIBPATH}/ mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
rm -r "${D}"/usr/${CHOST}/{include,lib} rm -r "${ED}"/usr/${CHOST}/{include,lib}
fi fi
fi fi
insinto ${INCPATH} insinto ${INCPATH}
@ -374,9 +377,9 @@ toolchain-binutils_src_install() {
splay-tree.h splay-tree.h
) )
doins "${libiberty_headers[@]/#/${S}/include/}" || die doins "${libiberty_headers[@]/#/${S}/include/}" || die
if [[ -d ${D}/${LIBPATH}/lib ]] ; then if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
mv "${D}"/${LIBPATH}/lib/* "${D}"/${LIBPATH}/ mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
rm -r "${D}"/${LIBPATH}/lib rm -r "${ED}"/${LIBPATH}/lib
fi fi
# Insert elf2flt where appropriate # Insert elf2flt where appropriate
@ -386,7 +389,7 @@ toolchain-binutils_src_install() {
doins elf2flt.ld || die "doins elf2flt.ld failed" doins elf2flt.ld || die "doins elf2flt.ld failed"
exeinto ${BINPATH} exeinto ${BINPATH}
doexe elf2flt flthdr || die "doexe elf2flt flthdr failed" doexe elf2flt flthdr || die "doexe elf2flt flthdr failed"
mv "${D}"/${BINPATH}/{ld,ld.real} || die mv "${ED}"/${BINPATH}/{ld,ld.real} || die
newexe ld-elf2flt ld || die "doexe ld-elf2flt failed" newexe ld-elf2flt ld || die "doexe ld-elf2flt failed"
newdoc README README.elf2flt newdoc README README.elf2flt
fi fi
@ -411,15 +414,14 @@ toolchain-binutils_src_install() {
[[ -n ${src}${dst} ]] && FAKE_TARGETS="${FAKE_TARGETS} ${CTARGET/${src}/${dst}}" [[ -n ${src}${dst} ]] && FAKE_TARGETS="${FAKE_TARGETS} ${CTARGET/${src}/${dst}}"
# Generate an env.d entry for this binutils # Generate an env.d entry for this binutils
cd "${S}"
insinto /etc/env.d/binutils insinto /etc/env.d/binutils
cat <<-EOF > env.d cat <<-EOF > "${T}"/env.d
TARGET="${CTARGET}" TARGET="${CTARGET}"
VER="${BVER}" VER="${BVER}"
LIBPATH="${LIBPATH}" LIBPATH="${EPREFIX}${LIBPATH}"
FAKE_TARGETS="${FAKE_TARGETS}" FAKE_TARGETS="${FAKE_TARGETS}"
EOF EOF
newins env.d ${CTARGET}-${BVER} newins "${T}"/env.d ${CTARGET}-${BVER}
# Handle documentation # Handle documentation
if ! is_cross ; then if ! is_cross ; then
@ -441,14 +443,14 @@ toolchain-binutils_src_install() {
dodoc opcodes/ChangeLog* dodoc opcodes/ChangeLog*
fi fi
# Remove shared info pages # Remove shared info pages
rm -f "${D}"/${DATAPATH}/info/{dir,configure.info,standards.info} rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
# Trim all empty dirs # Trim all empty dirs
find "${D}" -type d | xargs rmdir >& /dev/null find "${ED}" -type d | xargs rmdir >& /dev/null
} }
toolchain-binutils_pkg_postinst() { toolchain-binutils_pkg_postinst() {
# Make sure this ${CTARGET} has a binutils version selected # Make sure this ${CTARGET} has a binutils version selected
[[ -e ${ROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0 [[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
binutils-config ${CTARGET}-${BVER} binutils-config ${CTARGET}-${BVER}
} }
@ -461,7 +463,7 @@ toolchain-binutils_pkg_postrm() {
# rerun binutils-config if this is a remerge, as # rerun binutils-config if this is a remerge, as
# we want the mtimes on the symlinks updated (if # we want the mtimes on the symlinks updated (if
# it is the same as the current selected profile) # it is the same as the current selected profile)
if [[ ! -e ${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${BVER} ]] ; then if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${BVER} ]] ; then
local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}') local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
choice=${choice//$'\n'/ } choice=${choice//$'\n'/ }
choice=${choice/* } choice=${choice/* }

View File

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation # Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.121 2013/05/14 20:40:34 vapier Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.123 2013/10/12 21:31:01 vapier Exp $
# @ECLASS: toolchain-funcs.eclass # @ECLASS: toolchain-funcs.eclass
# @MAINTAINER: # @MAINTAINER:
@ -224,6 +224,12 @@ tc-export_build_env() {
: ${BUILD_CPPFLAGS:=} : ${BUILD_CPPFLAGS:=}
: ${BUILD_LDFLAGS:=} : ${BUILD_LDFLAGS:=}
export BUILD_{C,CXX,CPP,LD}FLAGS export BUILD_{C,CXX,CPP,LD}FLAGS
# Some packages use XXX_FOR_BUILD.
local v
for v in BUILD_{C,CXX,CPP,LD}FLAGS ; do
export ${v#BUILD_}_FOR_BUILD="${!v}"
done
} }
# @FUNCTION: tc-env_build # @FUNCTION: tc-env_build
@ -644,7 +650,15 @@ gen_usr_ldscript() {
# OUTPUT_FORMAT gives hints to the linker as to what binary format # OUTPUT_FORMAT gives hints to the linker as to what binary format
# is referenced ... makes multilib saner # is referenced ... makes multilib saner
output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p') local flags=( ${CFLAGS} ${LDFLAGS} -Wl,--verbose )
if $(tc-getLD) --version | grep -q 'GNU gold' ; then
# If they're using gold, manually invoke the old bfd. #487696
local d="${T}/bfd-linker"
mkdir -p "${d}"
ln -sf $(which ${CHOST}-ld.bfd) "${d}"/ld
flags+=( -B"${d}" )
fi
output_format=$($(tc-getCC) "${flags[@]}" 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )" [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
for lib in "$@" ; do for lib in "$@" ; do

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.600 2013/08/15 04:39:24 dirtyepic Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.602 2013/11/05 05:21:30 dirtyepic Exp $
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org> # Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@ -112,7 +112,8 @@ if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
[[ -n ${D_VER} ]] && IUSE+=" d" [[ -n ${D_VER} ]] && IUSE+=" d"
[[ -n ${SPECS_VER} ]] && IUSE+=" nossp" [[ -n ${SPECS_VER} ]] && IUSE+=" nossp"
tc_version_is_at_least 3 && IUSE+=" doc gcj gtk hardened multilib objc" tc_version_is_at_least 3 && IUSE+=" doc gcj gtk hardened multilib objc"
tc_version_is_at_least 4.0 && IUSE+=" objc-gc mudflap" tc_version_is_at_least 4.0 && IUSE+=" objc-gc"
tc_version_is_at_least 4.0 && ! tc_version_is_at_least 4.9 && IUSE+=" mudflap"
tc_version_is_at_least 4.1 && IUSE+=" libssp objc++" tc_version_is_at_least 4.1 && IUSE+=" libssp objc++"
tc_version_is_at_least 4.2 && IUSE+=" openmp" tc_version_is_at_least 4.2 && IUSE+=" openmp"
tc_version_is_at_least 4.3 && IUSE+=" fixed-point" tc_version_is_at_least 4.3 && IUSE+=" fixed-point"
@ -1640,6 +1641,7 @@ toolchain_src_install() {
if tc_version_is_at_least 4.0 ; then if tc_version_is_at_least 4.0 ; then
newins "${GCC_FILESDIR}"/awk/fixlafiles.awk-no_gcc_la fixlafiles.awk || die newins "${GCC_FILESDIR}"/awk/fixlafiles.awk-no_gcc_la fixlafiles.awk || die
find "${D}/${LIBPATH}" -name libstdc++.la -type f -exec rm "{}" \; find "${D}/${LIBPATH}" -name libstdc++.la -type f -exec rm "{}" \;
find "${D}/${LIBPATH}" -name "lib?san.la" -type f -exec rm "{}" \; # 487550
else else
doins "${GCC_FILESDIR}"/awk/fixlafiles.awk || die doins "${GCC_FILESDIR}"/awk/fixlafiles.awk || die
fi fi

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/vala.eclass,v 1.6 2013/03/29 12:27:04 pacho Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/vala.eclass,v 1.7 2013/10/04 22:11:54 tetromino Exp $
# @ECLASS: vala.eclass # @ECLASS: vala.eclass
# @MAINTAINER: # @MAINTAINER:
@ -31,8 +31,8 @@ VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.10}
# @ECLASS-VARIABLE: VALA_MAX_API_VERSION # @ECLASS-VARIABLE: VALA_MAX_API_VERSION
# @DESCRIPTION: # @DESCRIPTION:
# Maximum vala API version (e.g. 0.18). # Maximum vala API version (e.g. 0.20).
VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.20} VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.22}
# @ECLASS-VARIABLE: VALA_USE_DEPEND # @ECLASS-VARIABLE: VALA_USE_DEPEND
# @DEFAULT_UNSET # @DEFAULT_UNSET

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.24 2013/04/13 19:07:31 hd_brummy Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.25 2013/10/07 12:21:14 hd_brummy Exp $
# @ECLASS: vdr-plugin-2.eclass # @ECLASS: vdr-plugin-2.eclass
# @MAINTAINER: # @MAINTAINER:
@ -203,7 +203,7 @@ dev_check() {
# A lot useful debug infos # A lot useful debug infos
# set VDR_MAINTAINER_MODE="1" in make.conf # set VDR_MAINTAINER_MODE="1" in make.conf
if [[ -n ${VDR_MAINTAINER_MODE} ]]; then if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
eerror "\t Maintainer Info: $@" eerror "\t Gentoo Developer Debug: $@"
fi fi
} }

View File

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.205 2012/10/24 18:55:30 ulm Exp $ # $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.220 2013/06/11 09:25:45 radhermit Exp $
# Authors: # Authors:
# Jim Ramsay <lack@gentoo.org> # Jim Ramsay <lack@gentoo.org>
@ -10,9 +10,7 @@
# Ciaran McCreesh <ciaranm@gentoo.org> # Ciaran McCreesh <ciaranm@gentoo.org>
# Mike Kelly <pioto@gentoo.org> # Mike Kelly <pioto@gentoo.org>
# This eclass handles vim, gvim and vim-core. Support for -cvs ebuilds is # This eclass handles vim, gvim and vim-core.
# included in the eclass, since it's rather easy to do, but there are no
# official vim*-cvs ebuilds in the tree.
# gvim's GUI preference order is as follows: # gvim's GUI preference order is as follows:
# aqua CARBON (not tested) # aqua CARBON (not tested)
@ -22,51 +20,54 @@
# -aqua -gtk -motif neXt NEXTAW # -aqua -gtk -motif neXt NEXTAW
# -aqua -gtk -motif -neXt ATHENA # -aqua -gtk -motif -neXt ATHENA
# Support -cvs ebuilds, even though they're not in the official tree.
MY_PN=${PN%-cvs}
if [[ ${MY_PN} != "vim-core" ]] ; then
# vim supports python-2 only
PYTHON_DEPEND="python? 2"
PYTHON_USE_WITH_OPT="python"
PYTHON_USE_WITH="threads"
fi
inherit eutils vim-doc flag-o-matic versionator fdo-mime bash-completion-r1 prefix python
HOMEPAGE="http://www.vim.org/"
SLOT="0"
LICENSE="vim"
# Check for EAPI functions we need: # Check for EAPI functions we need:
case "${EAPI:-0}" in case "${EAPI:-0}" in
0|1) 0|1)
die "vim.eclass no longer supports EAPI 0 or 1" die "vim.eclass no longer supports EAPI 0 or 1"
;; ;;
2|3) 2|3)
HAS_SRC_PREPARE=1 ;;
HAS_USE_DEP=1 5)
HAS_PYTHON_R1=1
;; ;;
*) *)
die "Unknown EAPI ${EAPI}" die "Unknown EAPI ${EAPI}"
;; ;;
esac esac
if [[ ${PN##*-} == "cvs" ]] ; then if [[ ${PN} != "vim-core" ]] ; then
inherit cvs if [[ ${HAS_PYTHON_R1} ]]; then
PYTHON_REQ_USE=threads
inherit python-single-r1
else
# vim supports python-2 only
PYTHON_DEPEND="python? 2"
PYTHON_USE_WITH_OPT="python"
PYTHON_USE_WITH="threads"
inherit python
fi
fi fi
inherit eutils vim-doc flag-o-matic versionator fdo-mime bash-completion-r1 prefix
if [[ ${PV} == 9999* ]] ; then
inherit mercurial
EHG_REPO_URI="https://vim.googlecode.com/hg/"
EHG_PROJECT="vim"
fi
HOMEPAGE="http://www.vim.org/"
SLOT="0"
LICENSE="vim"
IUSE="nls acl" IUSE="nls acl"
TO_EXPORT="pkg_setup src_compile src_install src_test pkg_postinst pkg_postrm" EXPORT_FUNCTIONS pkg_setup src_prepare src_compile src_configure \
if [[ $HAS_SRC_PREPARE ]]; then src_install src_test pkg_postinst pkg_postrm
TO_EXPORT="${TO_EXPORT} src_prepare src_configure"
else
TO_EXPORT="${TO_EXPORT} src_unpack"
fi
EXPORT_FUNCTIONS ${TO_EXPORT}
DEPEND="${DEPEND} DEPEND="${DEPEND}
>=app-admin/eselect-vi-1.1 >=app-admin/eselect-vi-1.1
sys-apps/gawk
>=sys-apps/sed-4 >=sys-apps/sed-4
sys-devel/autoconf sys-devel/autoconf
>=sys-libs/ncurses-5.2-r2 >=sys-libs/ncurses-5.2-r2
@ -76,12 +77,20 @@ RDEPEND="${RDEPEND}
>=sys-libs/ncurses-5.2-r2 >=sys-libs/ncurses-5.2-r2
nls? ( virtual/libintl )" nls? ( virtual/libintl )"
if [[ ${MY_PN} == "vim-core" ]] ; then if [[ ${PN} == "vim-core" ]] ; then
IUSE="${IUSE} livecd" IUSE="${IUSE} livecd"
PDEPEND="!livecd? ( app-vim/gentoo-syntax )" PDEPEND="!livecd? ( app-vim/gentoo-syntax )"
else else
IUSE="${IUSE} cscope debug gpm perl python ruby" IUSE="${IUSE} cscope debug gpm perl python ruby"
if [[ ${HAS_PYTHON_R1} ]]; then
DEPEND="${DEPEND}
python? ( ${PYTHON_DEPS} )"
RDEPEND="${RDEPEND}
python? ( ${PYTHON_DEPS} )"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
fi
DEPEND="${DEPEND} DEPEND="${DEPEND}
cscope? ( dev-util/cscope ) cscope? ( dev-util/cscope )
gpm? ( >=sys-libs/gpm-1.19.3 ) gpm? ( >=sys-libs/gpm-1.19.3 )
@ -106,7 +115,7 @@ else
# RDEPEND="${RDEPEND} # RDEPEND="${RDEPEND}
# mzscheme? ( dev-scheme/mzscheme )" # mzscheme? ( dev-scheme/mzscheme )"
if [[ ${MY_PN} == vim ]] ; then if [[ ${PN} == vim ]] ; then
IUSE="${IUSE} X minimal vim-pager" IUSE="${IUSE} X minimal vim-pager"
DEPEND="${DEPEND} DEPEND="${DEPEND}
X? ( x11-libs/libXt x11-libs/libX11 X? ( x11-libs/libXt x11-libs/libX11
@ -117,7 +126,7 @@ else
!minimal? ( ~app-editors/vim-core-${PV} !minimal? ( ~app-editors/vim-core-${PV}
dev-util/ctags ) dev-util/ctags )
!<app-editors/nvi-1.81.5-r4" !<app-editors/nvi-1.81.5-r4"
elif [[ ${MY_PN} == gvim ]] ; then elif [[ ${PN} == gvim ]] ; then
IUSE="${IUSE} aqua gnome gtk motif neXt netbeans" IUSE="${IUSE} aqua gnome gtk motif neXt netbeans"
DEPEND="${DEPEND} DEPEND="${DEPEND}
dev-util/ctags dev-util/ctags
@ -151,6 +160,8 @@ else
fi fi
fi fi
S=${WORKDIR}/vim${VIM_VERSION/.}
apply_vim_patches() { apply_vim_patches() {
local p local p
cd "${S}" || die "cd ${S} failed" cd "${S}" || die "cd ${S} failed"
@ -238,28 +249,22 @@ vim_pkg_setup() {
mkdir -p "${T}/home" mkdir -p "${T}/home"
export HOME="${T}/home" export HOME="${T}/home"
if [[ ${MY_PN} != "vim-core" ]] && use python; then if [[ ${PN} != "vim-core" ]] && use python; then
# vim supports python-2 only if [[ ${HAS_PYTHON_R1} ]]; then
python_set_active_version 2 python-single-r1_pkg_setup
if [[ $HAS_USE_DEP ]]; then else
# vim supports python-2 only
python_set_active_version 2
# python.eclass only defines python_pkg_setup for EAPIs that support # python.eclass only defines python_pkg_setup for EAPIs that support
# USE dependencies # USE dependencies
python_pkg_setup python_pkg_setup
elif ! has_version "=dev-lang/python-2*[threads]"; then
die "You must build dev-lang/python with USE=threads"
fi fi
fi fi
} }
vim_src_prepare() { vim_src_prepare() {
has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
if [[ ${PN##*-} == cvs ]] ; then if [[ ${PV} != 9999* ]] ; then
ECVS_SERVER="vim.cvs.sourceforge.net:/cvsroot/vim"
ECVS_PASS=""
ECVS_MODULE="vim7"
ECVS_TOP_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/cvs-src/${ECVS_MODULE}"
cvs_src_unpack
else
# Apply any patches available from vim.org for this version # Apply any patches available from vim.org for this version
if [[ $VIM_ORG_PATCHES == *.patch.bz2 ]]; then if [[ $VIM_ORG_PATCHES == *.patch.bz2 ]]; then
einfo "Applying monolithic patch ${VIM_ORG_PATCHES}" einfo "Applying monolithic patch ${VIM_ORG_PATCHES}"
@ -267,18 +272,6 @@ vim_src_prepare() {
else else
apply_vim_patches apply_vim_patches
fi fi
# Unpack the runtime snapshot if available (only for vim-core)
if [[ -n "$VIM_RUNTIME_SNAP" ]] ; then
cd "${S}" || die
ebegin "Unpacking vim runtime snapshot"
rm -rf runtime
# Changed this from bzip2 |tar to tar -j since the former broke for
# some reason on freebsd.
# --spb, 2004/12/18
tar xjf "${DISTDIR}"/${VIM_RUNTIME_SNAP}
eend $?
fi
fi fi
# Another set of patches borrowed from src rpm to fix syntax errors etc. # Another set of patches borrowed from src rpm to fix syntax errors etc.
@ -286,20 +279,12 @@ vim_src_prepare() {
if [[ -d "${WORKDIR}"/gentoo/patches-all/ ]]; then if [[ -d "${WORKDIR}"/gentoo/patches-all/ ]]; then
EPATCH_SUFFIX="gz" EPATCH_FORCE="yes" \ EPATCH_SUFFIX="gz" EPATCH_FORCE="yes" \
epatch "${WORKDIR}"/gentoo/patches-all/ epatch "${WORKDIR}"/gentoo/patches-all/
elif [[ ${MY_PN} == "vim-core" ]] && [[ -d "${WORKDIR}"/gentoo/patches-core/ ]]; then elif [[ ${PN} == "vim-core" ]] && [[ -d "${WORKDIR}"/gentoo/patches-core/ ]]; then
# Patches for vim-core only (runtime/*) # Patches for vim-core only (runtime/*)
EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \ EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
epatch "${WORKDIR}"/gentoo/patches-core/ epatch "${WORKDIR}"/gentoo/patches-core/
fi fi
# Unpack an updated netrw snapshot if necessary. This is nasty. Don't
# ask, you don't want to know.
if [[ -n "${VIM_NETRW_SNAP}" ]] ; then
ebegin "Unpacking updated netrw snapshot"
tar xjf "${DISTDIR}"/${VIM_NETRW_SNAP} -C runtime/
eend $?
fi
# Fixup a script to use awk instead of nawk # Fixup a script to use awk instead of nawk
sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \ sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
|| die "mve.awk sed failed" || die "mve.awk sed failed"
@ -333,7 +318,7 @@ vim_src_prepare() {
find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
# conditionally make the manpager.sh script # conditionally make the manpager.sh script
if [[ ${MY_PN} == vim ]] && use vim-pager ; then if [[ ${PN} == vim ]] && use vim-pager ; then
cat <<END > "${S}"/runtime/macros/manpager.sh cat <<END > "${S}"/runtime/macros/manpager.sh
#!/bin/sh #!/bin/sh
sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\ sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
@ -363,11 +348,6 @@ END
fi fi
} }
vim_src_unpack() {
unpack ${A}
vim_src_prepare
}
vim_src_configure() { vim_src_configure() {
local myconf local myconf
@ -400,8 +380,8 @@ vim_src_configure() {
[[ -e ${file} ]] && addwrite $file [[ -e ${file} ]] && addwrite $file
done done
if [[ ${MY_PN} == "vim-core" ]] || if [[ ${PN} == "vim-core" ]] ||
( [[ ${MY_PN} == vim ]] && use minimal ); then ( [[ ${PN} == vim ]] && use minimal ); then
myconf="--with-features=tiny \ myconf="--with-features=tiny \
--enable-gui=no \ --enable-gui=no \
--without-x \ --without-x \
@ -416,18 +396,32 @@ vim_src_configure() {
myconf="--with-features=huge \ myconf="--with-features=huge \
--enable-multibyte" --enable-multibyte"
myconf="${myconf} `use_enable cscope`" myconf="${myconf} $(use_enable cscope)"
myconf="${myconf} `use_enable gpm`" myconf="${myconf} $(use_enable gpm)"
myconf="${myconf} `use_enable perl perlinterp`" myconf="${myconf} $(use_enable perl perlinterp)"
myconf="${myconf} `use_enable python pythoninterp`" if [[ ${HAS_PYTHON_R1} ]]; then
myconf="${myconf} `use_enable ruby rubyinterp`" if use python; then
if [[ ${EPYTHON} == python3* ]]; then
myconf="${myconf} --enable-python3interp"
export vi_cv_path_python3="${PYTHON}"
else
myconf="${myconf} --enable-pythoninterp"
export vi_cv_path_python="${PYTHON}"
fi
else
myconf="${myconf} --disable-pythoninterp --disable-python3interp"
fi
else
myconf="${myconf} $(use_enable python pythoninterp)"
fi
myconf="${myconf} $(use_enable ruby rubyinterp)"
# tclinterp is broken; when you --enable-tclinterp flag, then # tclinterp is broken; when you --enable-tclinterp flag, then
# the following command never returns: # the following command never returns:
# VIMINIT='let OS=system("uname -s")' vim # VIMINIT='let OS=system("uname -s")' vim
# mzscheme support is currently broken. bug #91970 # mzscheme support is currently broken. bug #91970
#myconf="${myconf} `use_enable mzscheme mzschemeinterp`" #myconf="${myconf} $(use_enable mzscheme mzschemeinterp)"
if [[ ${MY_PN} == gvim ]] ; then if [[ ${PN} == gvim ]] ; then
myconf="${myconf} `use_enable netbeans`" myconf="${myconf} $(use_enable netbeans)"
fi fi
# --with-features=huge forces on cscope even if we --disable it. We need # --with-features=huge forces on cscope even if we --disable it. We need
@ -437,12 +431,12 @@ vim_src_configure() {
die "couldn't disable cscope" die "couldn't disable cscope"
fi fi
if [[ ${MY_PN} == vim ]] ; then if [[ ${PN} == vim ]] ; then
# don't test USE=X here ... see bug #19115 # don't test USE=X here ... see bug #19115
# but need to provide a way to link against X ... see bug #20093 # but need to provide a way to link against X ... see bug #20093
myconf="${myconf} --enable-gui=no --disable-darwin `use_with X x`" myconf="${myconf} --enable-gui=no --disable-darwin $(use_with X x)"
elif [[ ${MY_PN} == gvim ]] ; then elif [[ ${PN} == gvim ]] ; then
myconf="${myconf} --with-vim-name=gvim --with-x" myconf="${myconf} --with-vim-name=gvim --with-x"
echo ; echo echo ; echo
@ -471,20 +465,16 @@ vim_src_configure() {
echo ; echo echo ; echo
else else
die "vim.eclass doesn't understand MY_PN=${MY_PN}" die "vim.eclass doesn't understand PN=${PN}"
fi fi
fi fi
if [[ ${MY_PN} == vim ]] && use minimal ; then if [[ ${PN} == vim ]] && use minimal ; then
myconf="${myconf} --disable-nls --disable-multibyte --disable-acl" myconf="${myconf} --disable-nls --disable-multibyte --disable-acl"
else else
myconf="${myconf} `use_enable nls` `use_enable acl`" myconf="${myconf} $(use_enable nls) $(use_enable acl)"
fi fi
# Note: If USE=gpm, then ncurses will still be required. See bug #93970
# for the reasons behind the USE flag change.
myconf="${myconf} --with-tlib=curses"
myconf="${myconf} --disable-selinux" myconf="${myconf} --disable-selinux"
# Let Portage do the stripping. Some people like that. # Let Portage do the stripping. Some people like that.
@ -493,7 +483,7 @@ vim_src_configure() {
# Keep Gentoo Prefix env contained within the EPREFIX # Keep Gentoo Prefix env contained within the EPREFIX
use prefix && myconf="${myconf} --without-local-dir" use prefix && myconf="${myconf} --without-local-dir"
if [[ ${MY_PN} == "*vim" ]] ; then if [[ ${PN} == "*vim" ]] ; then
if [[ ${CHOST} == *-interix* ]]; then if [[ ${CHOST} == *-interix* ]]; then
# avoid finding of this function, to avoid having to patch either # avoid finding of this function, to avoid having to patch either
# configure or the source, which would be much more hackish. # configure or the source, which would be much more hackish.
@ -507,12 +497,10 @@ vim_src_configure() {
} }
vim_src_compile() { vim_src_compile() {
has src_configure ${TO_EXPORT} || vim_src_configure
# The following allows emake to be used # The following allows emake to be used
emake -j1 -C src auto/osdef.h objects || die "make failed" emake -j1 -C src auto/osdef.h objects || die "make failed"
if [[ ${MY_PN} == "vim-core" ]] ; then if [[ ${PN} == "vim-core" ]] ; then
emake tools || die "emake tools failed" emake tools || die "emake tools failed"
rm -f src/vim rm -f src/vim
else else
@ -532,7 +520,7 @@ vim_src_install() {
has "${EAPI:-0}" 0 1 2 && use !prefix && ED="${D}" has "${EAPI:-0}" 0 1 2 && use !prefix && ED="${D}"
local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
if [[ ${MY_PN} == "vim-core" ]] ; then if [[ ${PN} == "vim-core" ]] ; then
dodir /usr/{bin,share/{man/man1,vim}} dodir /usr/{bin,share/{man/man1,vim}}
cd src || die "cd src failed" cd src || die "cd src failed"
make \ make \
@ -585,7 +573,7 @@ vim_src_install() {
# exist. # exist.
rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null
elif [[ ${MY_PN} == gvim ]] ; then elif [[ ${PN} == gvim ]] ; then
dobin src/gvim dobin src/gvim
dosym gvim /usr/bin/gvimdiff dosym gvim /usr/bin/gvimdiff
dosym gvim /usr/bin/evim dosym gvim /usr/bin/evim
@ -593,9 +581,11 @@ vim_src_install() {
dosym gvim /usr/bin/gview dosym gvim /usr/bin/gview
dosym gvim /usr/bin/rgvim dosym gvim /usr/bin/rgvim
dosym gvim /usr/bin/rgview dosym gvim /usr/bin/rgview
dosym vim.1.gz /usr/share/man/man1/gvim.1.gz
dosym vim.1.gz /usr/share/man/man1/gview.1.gz dodir /usr/share/man/man1
dosym vimdiff.1.gz /usr/share/man/man1/gvimdiff.1.gz echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1
echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1
echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1
insinto /etc/vim insinto /etc/vim
newins "${FILESDIR}"/gvimrc${GVIMRC_FILE_SUFFIX} gvimrc newins "${FILESDIR}"/gvimrc${GVIMRC_FILE_SUFFIX} gvimrc
@ -623,10 +613,10 @@ vim_src_install() {
fi fi
# bash completion script, bug #79018. # bash completion script, bug #79018.
if [[ ${MY_PN} == "vim-core" ]] ; then if [[ ${PN} == "vim-core" ]] ; then
newbashcomp "${FILESDIR}"/xxd-completion xxd newbashcomp "${FILESDIR}"/xxd-completion xxd
else else
newbashcomp "${FILESDIR}"/${MY_PN}-completion ${MY_PN} newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
fi fi
# We shouldn't be installing the ex or view man page symlinks, as they # We shouldn't be installing the ex or view man page symlinks, as they
# are managed by eselect-vi # are managed by eselect-vi
@ -674,11 +664,11 @@ vim_pkg_postinst() {
update_vim_helptags update_vim_helptags
# Update fdo mime stuff, bug #78394 # Update fdo mime stuff, bug #78394
if [[ ${MY_PN} == gvim ]] ; then if [[ ${PN} == gvim ]] ; then
fdo-mime_mime_database_update fdo-mime_mime_database_update
fi fi
if [[ ${MY_PN} == vim ]] ; then if [[ ${PN} == vim ]] ; then
if use X; then if use X; then
echo echo
elog "The 'X' USE flag enables vim <-> X communication, like" elog "The 'X' USE flag enables vim <-> X communication, like"
@ -697,33 +687,15 @@ vim_pkg_postinst() {
echo echo
ewarn "Note that the English word lists are no longer installed by" ewarn "Note that the English word lists are no longer installed by"
ewarn "default." ewarn "default."
echo
if [[ ${MY_PN} != "vim-core" ]] ; then if [[ ${PN} != "vim-core" ]] ; then
echo echo
elog "To see what's new in this release, use :help version${VIM_VERSION/.*/}.txt" elog "To see what's new in this release, use :help version${VIM_VERSION/.*/}.txt"
fi fi
# Warn about VIMRUNTIME
if [ -n "$VIMRUNTIME" -a "${VIMRUNTIME##*/vim}" != "${VIM_VERSION/./}" ] ; then
echo
ewarn "WARNING: You have VIMRUNTIME set in your environment from an old"
ewarn "installation. You will need to either unset VIMRUNTIME in each"
ewarn "terminal, or log out completely and back in. This problem won't"
ewarn "happen again since the ebuild no longer sets VIMRUNTIME."
fi
# Scream loudly if the user is using a -cvs ebuild
if [[ -z "${PN/*-cvs/}" ]] ; then
ewarn
ewarn "You are using a -cvs ebuild. Be warned that this is not"
ewarn "officially supported and may not work."
ebeep 5
fi
echo
# Make convenience symlinks # Make convenience symlinks
if [[ ${MY_PN} != "vim-core" ]] ; then if [[ ${PN} != "vim-core" ]] ; then
# But only for vim/gvim, bug #252724 # But only for vim/gvim, bug #252724
update_vim_symlinks update_vim_symlinks
fi fi
@ -734,20 +706,20 @@ vim_pkg_postrm() {
update_vim_helptags update_vim_helptags
# Make convenience symlinks # Make convenience symlinks
if [[ ${MY_PN} != "vim-core" ]] ; then if [[ ${PN} != "vim-core" ]] ; then
# But only for vim/gvim, bug #252724 # But only for vim/gvim, bug #252724
update_vim_symlinks update_vim_symlinks
fi fi
# Update fdo mime stuff, bug #78394 # Update fdo mime stuff, bug #78394
if [[ ${MY_PN} == gvim ]] ; then if [[ ${PN} == gvim ]] ; then
fdo-mime_mime_database_update fdo-mime_mime_database_update
fi fi
} }
vim_src_test() { vim_src_test() {
if [[ ${MY_PN} == "vim-core" ]] ; then if [[ ${PN} == "vim-core" ]] ; then
einfo "No testing needs to be done for vim-core" einfo "No testing needs to be done for vim-core"
return return
fi fi
@ -765,7 +737,7 @@ vim_src_test() {
# Don't let vim talk to X # Don't let vim talk to X
unset DISPLAY unset DISPLAY
if [[ ${MY_PN} == gvim ]] ; then if [[ ${PN} == gvim ]] ; then
# Make gvim not try to connect to X. See :help gui-x11-start # Make gvim not try to connect to X. See :help gui-x11-start
# in vim for how this evil trickery works. # in vim for how this evil trickery works.
ln -s "${S}"/src/gvim "${S}"/src/testvim ln -s "${S}"/src/gvim "${S}"/src/testvim

View File

@ -1,11 +1,365 @@
# ChangeLog for profile directory # ChangeLog for profile directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8235 2013/09/13 09:18:19 mgorny Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8341 2013/11/06 21:05:14 pacho Exp $
# #
# This ChangeLog should include records for all changes in profiles directory. # This ChangeLog should include records for all changes in profiles directory.
# Only typo fixes which don't affect portage/repoman behaviour could be avoided # Only typo fixes which don't affect portage/repoman behaviour could be avoided
# here. If in doubt put a record here! # here. If in doubt put a record here!
06 Nov 2013; Pacho Ramos <pacho@gentoo.org> arch/x86/package.use.mask:
Keywords recovered
05 Nov 2013; Stanislav Ochotnicky <sochotnicky@gentoo.org> package.mask:
Mask =media-sounds/beets-1.3.1 for testing
04 Nov 2013; Sergey Popov <pinkbyte@gentoo.org> package.mask:
Mask sys-apps/pcfclock, wrt bug #489510
04 Nov 2013; Mike Gilbert <floppym@gentoo.org> package.mask:
Remove unifont mask since we now work around the problem in the grub ebuild.
04 Nov 2013; Jeroen Roovers <jer@gentoo.org> package.mask:
Unmask app-admin/sysstat-10.2.0.
03 Nov 2013; Robin H. Johnson <robbat2@gentoo.org> package.mask:
Mask app-emulation/qenv for treecleaning, doesn't build, qemu changed too
much.
03 Nov 2013; Luca Barbato <lu_zero@gentoo.org> package.mask:
Add a libav-0.8.9 multilib-ready version.
03 Nov 2013; Johannes Huber <johu@gentoo.org> package.mask:
Mask kde-misc/qtrans for removal.
03 Nov 2013; Johannes Huber <johu@gentoo.org> package.mask:
Mask kde-misc/kio-upnp-ms for removal.
03 Nov 2013; Ben de Groot <yngwin@gentoo.org> +updates/4Q-2013:
package move x11-themes/qtcurve-qt4 x11-themes/qtcurve
02 Nov 2013; Markos Chandras <hwoarang@gentoo.org> ChangeLog:
mask app-arch/xarchiver for removal
31 Oct 2013; Fabian Groffen <grobian@gentoo.org> profiles.desc:
Add profile for OS X Mavericks (10.9)
30 Oct 2013; Maxim Koltsov <maksbotan@gentoo.org> base/package.use.mask:
Unmask use ipod for >=media-sound/clementine-1.2.0
30 Oct 2013; Markos Chandras <hwoarang@gentoo.org> package.mask:
Unmask rtmpdump snapshot
29 Oct 2013; Manuel Rüger <mrueg@gentoo.org> package.mask:
Remove mask for treecleaned ruby18-only packages
28 Oct 2013; Fabian Groffen <grobian@gentoo.org> package.mask:
Remove exim 4.82 RC mask
28 Oct 2013; Lars Wendler <polynomial-c@gentoo.org> package.mask:
Masked app-arch/xz-utils alpha releases for testing.
24 Oct 2013; Tiziano Müller <dev-zero@gentoo.org>
desc/nginx_modules_http.desc, package.mask:
Add USE_EXPAND descriptions for nginx' auth_request and push_stream modules.
Mask nginx mainline version bump.
23 Oct 2013; Davide Pesavento <pesa@gentoo.org> package.mask:
Mask qt-creator 3.0 beta.
22 Oct 2013; Michał Górny <mgorny@gentoo.org> package.mask:
virtual/pyparsing has been removed.
21 Oct 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
package.mask:
Remove mesa security mask as i965 the driver is masked by package.use.mask
now, bug #472280.
21 Oct 2013; Markos Chandras <hwoarang@gentoo.org> package.mask:
sys-firmware/amd-ucode gone. Bug #455208
21 Oct 2013; Hans de Graaff <graaff@gentoo.org> package.mask:
Also mask relevant asset pipeline packages for Rails 3.1, fixing bug 488824
and 488826.
21 Oct 2013; Mike Gilbert <floppym@gentoo.org> package.mask:
Mask media-fonts/unifont-6.3
20 Oct 2013; Hans de Graaff <graaff@gentoo.org> package.mask:
Remove dev-ruby/ruby-bdb from mask because it is still used by rbot.
20 Oct 2013; Hans de Graaff <graaff@gentoo.org> package.mask:
Write better reason for removal.
20 Oct 2013; Hans de Graaff <graaff@gentoo.org> package.mask:
Mask more ruby18-only packages.
19 Oct 2013; Markos Chandras <hwoarang@gentoo.org> package.mask:
SLOT=4 for dev-cpp/libgdamm is gone. Bug #482910
19 Oct 2013; Pacho Ramos <pacho@gentoo.org>
+default/linux/amd64/13.0/desktop/kde/systemd/parent,
+default/linux/arm/13.0/desktop/kde/systemd/parent,
+default/linux/powerpc/ppc32/13.0/desktop/kde/systemd/parent,
+default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/kde/systemd/parent,
+default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/kde/systemd/parent,
+default/linux/powerpc/ppc64/13.0/desktop/kde/systemd/parent,
+default/linux/x86/13.0/desktop/kde/systemd/parent, profiles.desc:
Add kde/systemd variants too (#481920#c20)
19 Oct 2013; Hans de Graaff <graaff@gentoo.org> package.mask:
Mask Rails 3.1 for security bug 488298.
18 Oct 2013; Markos Chandras <hwoarang@gentoo.org> package.mask:
Mask new media-video/rtmpdump snapshots for testing
18 Oct 2013; Tim Harder <radhermit@gentoo.org> package.mask:
Mask =media-libs/libraw-0.16* for testing.
15 Oct 2013; Pacho Ramos <pacho@gentoo.org> targets/systemd/use.mask:
Add reference for consolekit vs logind
14 Oct 2013; Stanislav Ochotnicky <sochotnicky@gentoo.org> package.mask:
Mask live ebuild of sys-fs/simple-mtpfs (#488038)
14 Oct 2013; Stanislav Ochotnicky <sochotnicky@gentoo.org> package.mask:
Add media-video/pyqtrailer and dev-python/pytrailer removal mask
14 Oct 2013; Pacho Ramos <pacho@gentoo.org>
hardened/linux/amd64/no-multilib/package.mask:
Mask on more places :S
14 Oct 2013; Pacho Ramos <pacho@gentoo.org>
arch/amd64/no-multilib/package.mask, features/64bit-native/package.mask:
Mask packages relying on multilib
14 Oct 2013; Justin Lecher <jlec@gentoo.org> package.mask:
Mask metis-5 due to API change
14 Oct 2013; Justin Lecher <jlec@gentoo.org> use.desc:
fortran is a known language today, so we don't need toreference to f77
14 Oct 2013; Lars Wendler <polynomial-c@gentoo.org> package.mask:
Adjusted samba-4 mask for 4.1 release.
13 Oct 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
package.mask:
Mask vulnerable versions of mesa, bug #472280.
13 Oct 2013; Tom Wijsman <TomWij@gentoo.org> package.mask:
Added missing parentheses to really fix the dates.
13 Oct 2013; Lars Wendler <polynomial-c@gentoo.org> package.mask:
Masked >=sys-devel/make-4.0 for testing
13 Oct 2013; Agostino Sarubbo <ago@gentoo.org> package.mask:
Fix the date for the last entry
13 Oct 2013; Diego E. Pettenò <flameeyes@gentoo.org> package.mask:
Hardmask mod_spdy.
13 Oct 2013; Ulrich Müller <ulm@gentoo.org> package.mask:
Remove mask for app-editors/mg.
12 Oct 2013; Andreas K. Huettel <dilfridge@gentoo.org> package.mask:
Remove obsolete mask of dev-tex/natbib, bug 483974
12 Oct 2013; Pacho Ramos <pacho@gentoo.org> package.mask:
Mask for removal
12 Oct 2013; Pacho Ramos <pacho@gentoo.org> package.mask:
Cleanup entries
12 Oct 2013; Ulrich Müller <ulm@gentoo.org> package.mask:
Mask app-editors/mg, bug 487758.
11 Oct 2013; Markos Chandras <hwoarang@gentoo.org> package.mask:
Mask nx11-misc/lightdm-1.8 for futher testing
09 Oct 2013; Pacho Ramos <pacho@gentoo.org>
+default/linux/amd64/13.0/desktop/gnome/systemd/parent,
+default/linux/arm/13.0/desktop/gnome/systemd/parent,
+default/linux/powerpc/ppc32/13.0/desktop/gnome/systemd/parent,
+default/linux/powerpc/ppc64/13.0/32bit-userland/desktop/gnome/systemd/parent
,
+default/linux/powerpc/ppc64/13.0/64bit-userland/desktop/gnome/systemd/parent
, +default/linux/powerpc/ppc64/13.0/desktop/gnome/systemd/parent,
+default/linux/x86/13.0/desktop/gnome/systemd/parent, profiles.desc,
+targets/systemd/make.defaults, +targets/systemd/package.mask,
+targets/systemd/package.use.mask, +targets/systemd/use.mask:
Add systemd subprofiles (#481920 and
http://gentoo.2317880.n4.nabble.com/Addition-of-systemd-subprofiles-td270299.
html )
09 Oct 2013; Thomas Kahle <tomka@gentoo.org> package.mask:
Mask dev-games/gigi for removal
09 Oct 2013; Michał Górny <mgorny@gentoo.org> package.mask:
Finally unmask multilib OpenGL.
09 Oct 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org> package.mask:
Roll chromium dev channel masks for chromium-32.x.
07 Oct 2013; Ryan Hill <dirtyepic@gentoo.org> package.mask:
Unmask GCC 4.8.
05 Oct 2013; Tiziano Müller <dev-zero@gentoo.org>
desc/nginx_modules_http.desc, package.mask:
Lift mask of www-servers/nginx-1.4.2*
04 Oct 2013; Markos Chandras <hwoarang@gentoo.org> package.mask:
whitespace
04 Oct 2013; Markos Chandras <hwoarang@gentoo.org> package.mask:
Add forgotten amd-ucode mask entry. Bug #455208
04 Oct 2013; Julian Ospald <hasufell@gentoo.org> package.mask:
remove mask on net-p2p/pybitmessage, people can do their own research
3 Oct 2013; Chris Reffett <creffett@gentoo.org> package.mask:
Remove dev-games/neo* mask, packages removed
30 Sep 2013; Fabian Groffen <grobian@gentoo.org> package.mask:
Mask Exim 4.82 release candidates
29 Sep 2013; Andreas K. Huettel <dilfridge@gentoo.org> profiles.desc:
Downgrade s390 profiles to dev
28 Sep 2013; Pacho Ramos <pacho@gentoo.org> arch/alpha/package.use.mask,
arch/sparc/package.use.mask:
Drop masks as needed keywords were added (#478078)
28 Sep 2013; Pacho Ramos <pacho@gentoo.org> base/use.mask:
Mask openrc-force USE flag (#480336)
27 Sep 2013; Tiziano Müller <dev-zero@gentoo.org> package.mask:
Mask nginx >=1.4.2 for testing.
27 Sep 2013; Tiziano Müller <dev-zero@gentoo.org>
desc/nginx_modules_http.desc:
Add security to nginx_modules_http USE_EXPAND
26 Sep 2013; Michał Górny <mgorny@gentoo.org> package.mask:
Unmask python-exec:2 for wider testing.
26 Sep 2013; Sven Vermeulen <swift@gentoo.org> package.mask:
Masking openscap-9999
26 Sep 2013; Tiziano Müller <dev-zero@gentoo.org>
desc/nginx_modules_http.desc:
Add echo to nginx_modules_http USE_EXPAND
24 Sep 2013; Patrick Lauer <patrick@gentoo.org> package.mask:
Temporarily disable openldap mask until s390 catches up
23 Sep 2013; Agostino Sarubbo <ago@gentoo.org> package.mask:
mask older and vulnerable version of openldap
22 Sep 2013; Pacho Ramos <pacho@gentoo.org> arch/arm/package.use.mask:
Mask USE on arm due missing keywords
21 Sep 2013; Markos Chandras <hwoarang@gentoo.org> package.mask:
Mask zen-sources live ebuilds
21 Sep 2013; Michał Górny <mgorny@gentoo.org> package.mask:
Mask multilib OpenGL packages for testing.
21 Sep 2013; Michał Górny <mgorny@gentoo.org> package.mask:
Remove the mask on glu since the emul set is ready now.
21 Sep 2013; Michael Palimaka <kensington@gentoo.org>
targets/desktop/kde/package.use:
Enable xmp USE flag for media-gfx/exiv2 by default as it is required by
kde-base/libkexiv2.
20 Sep 2013; Ian Stakenvicius <axs@gentoo.org>
+default/linux/amd64/13.0/package.use.stable.mask:
stable masked abi_x86_32 on all relevant atoms
20 Sep 2013; Ian Stakenvicius <axs@gentoo.org> package.mask:
adjusted mask of mozplugger
19 Sep 2013; Tiziano Müller <dev-zero@gentoo.org> license_groups:
Add newly added Adaptec-EULA to the EULA license group (as discussed on the
gentoo-dev ml)
18 Sep 2013; Tom Wijsman <TomWij@gentoo.org> package.mask:
>=app-admin/ec2-api-tools-1.6.7.2-r4: Temporarily masked due to QA issue
during attempts to unbundle dependencies.
18 Sep 2013; Sergey Popov <pinkbyte@gentoo.org> package.mask:
Mask developer releases of dev-libs/botan
17 Sep 2013; Tim Harder <radhermit@gentoo.org> package.mask:
Unmask =media-video/mkvtoolnix-6.4.1.
17 Sep 2013; Michał Górny <mgorny@gentoo.org> package.mask:
Link the gentoo-dev thread in python-exec:2 p.mask.
17 Sep 2013; Michał Górny <mgorny@gentoo.org> package.mask:
Mask python-exec-2 for testing.
17 Sep 2013; Patrick Lauer <patrick@gentoo.org> package.mask:
Remove poppler mask as everything works now
16 Sep 2013; Tim Harder <radhermit@gentoo.org> package.mask:
Mask >=media-video/mkvtoolnix-6.4.0 until libmatroska-1.4.1 is released.
16 Sep 2013; Justin Lecher <jlec@gentoo.org> package.mask:
Mask gajim beta
15 Sep 2013; Joerg Bornkessel <hd_brummy@gentoo.org> package.mask:
media-plugins/vdr-sysinfo masked for removal on ~15/Oct/2013, Bug #414275
#414177
15 Sep 2013; Joerg Bornkessel <hd_brummy@gentoo.org> package.mask:
media-plugins/vdr-taste masked for removal on ~15/Oct/2013, Bug #414269
#414177
15 Sep 2013; Joerg Bornkessel <hd_brummy@gentoo.org> package.mask:
media-plugins/vdr-timeline masked for removal on ~15/Oct/2013, Bug #414261
#414177
15 Sep 2013; Joerg Bornkessel <hd_brummy@gentoo.org> package.mask:
media-plugins/vdr-tvonscreen masked for removal on ~15/Oct/2013, Bug #414257
#414177
15 Sep 2013; Joerg Bornkessel <hd_brummy@gentoo.org> package.mask:
media-plugins/vdr-tvtv masked for removal on ~15/Oct/2013, Bug #414255
#414177
15 Sep 2013; Joerg Bornkessel <hd_brummy@gentoo.org> package.mask:
media-plugins/vdr-vdrrip masked for removal on ~15/Oct/2013, Bug #414235
#414177
15 Sep 2013; Joerg Bornkessel <hd_brummy@gentoo.org> package.mask:
media-plugins/vdr-prefermenu masked for removal on ~15/Oct/2013, Bug #420883
#414177
15 Sep 2013; Joerg Bornkessel <hd_brummy@gentoo.org> package.mask:
cleanup pmask for media-plugins/vdr-channelscan, depend on wrt bug #474480
155253 414177, removed from tree
15 Sep 2013; Hans de Graaff <graaff@gentoo.org> package.mask:
Remove masked ruby18-only packages.
14 Sep 2013; Alexis Ballier <aballier@gentoo.org> package.mask:
unmask ocaml 4.01.0
14 Sep 2013; Amadeusz Żołnowski <aidecoe@gentoo.org>
desc/dracut_modules.desc:
Added dash use expand to dracut_modules.
14 Sep 2013; Tom Wijsman <TomWij@gentoo.org> package.mask:
Expand sun-* package.mask reason to explain continuation, alternatives and
also mask and explain JCE; as requested in bugs #473830 and bug #484680,
reported by Martin Mokrejš.
14 Sep 2013; Hans de Graaff <graaff@gentoo.org> package.mask:
Remove masked ruby18-only packages.
13 Sep 2013; Markos Chandras <hwoarang@gentoo.org> package.mask:
Mask dev-lang/jimtcl-9999 live ebuild
13 Sep 2013; Michał Górny <mgorny@gentoo.org> package.mask: 13 Sep 2013; Michał Górny <mgorny@gentoo.org> package.mask:
Mask new PAM due to segfault in pam_unix.so, bug #484732. Mask new PAM due to segfault in pam_unix.so, bug #484732.
@ -91,7 +445,7 @@
still depend on an unqualified dev-lang/ruby, bug 483254. still depend on an unqualified dev-lang/ruby, bug 483254.
03 Sep 2013; <creffett@gentoo.org> package.mask: 03 Sep 2013; <creffett@gentoo.org> package.mask:
Lastrite dev-games/neo{engine,tools} Lastrite dev-games/neo{engine,tools}
02 Sep 2013; Alexandre Rostovtsev <tetromino@gentoo.org> package.mask: 02 Sep 2013; Alexandre Rostovtsev <tetromino@gentoo.org> package.mask:
Temporarily mask libsecret-0.16 due to API/ABI change (bug #483414). Temporarily mask libsecret-0.16 due to API/ABI change (bug #483414).
@ -222,7 +576,7 @@
17 Aug 2013; Mikle Kolyada <zlogene@gentoo.org> package.mask: 17 Aug 2013; Mikle Kolyada <zlogene@gentoo.org> package.mask:
Remove obsolete mask on dev-perl/Date-ISO Remove obsolete mask on dev-perl/Date-ISO
17 Aug 2013; <creffett@gentoo.org> package.mask: 17 Aug 2013; <creffett@gentoo.org> package.mask:
Remove tg-widgets-* from package.mask as they are now gone from the tree Remove tg-widgets-* from package.mask as they are now gone from the tree
@ -725,15 +1079,15 @@
Masked for removal in 30 days, bug #440670. Masked for removal in 30 days, bug #440670.
07 Jun 2013; Rick Farina <zerochaos@gentoo.org> 07 Jun 2013; Rick Farina <zerochaos@gentoo.org>
package.mask: removing gnuradio-3.7 and gr-osmosdr-0.1.0/gr-iqbal package.mask: removing gnuradio-3.7 and gr-osmosdr-0.1.0/gr-iqbal
masks now that upstream has a working release masks now that upstream has a working release
07 Jun 2013; Rick Farina <zerochaos@gentoo.org> 07 Jun 2013; Rick Farina <zerochaos@gentoo.org>
package.mask: adding gr-iqbal-0.37.0 and gr-osmosdr-0.1.0, they don't package.mask: adding gr-iqbal-0.37.0 and gr-osmosdr-0.1.0, they don't
work together due to upstream issues work together due to upstream issues
07 Jun 2013; Rick Farina <zerochaos@gentoo.org> 07 Jun 2013; Rick Farina <zerochaos@gentoo.org>
package.mask: masking gnuradio-3.7 because basically nothing works package.mask: masking gnuradio-3.7 because basically nothing works
with it with it
06 Jul 2013; Ulrich Müller <ulm@gentoo.org> +updates/3Q-2013: 06 Jul 2013; Ulrich Müller <ulm@gentoo.org> +updates/3Q-2013:

View File

@ -1,6 +1,18 @@
# ChangeLog for Gentoo/Alpha profile directory # ChangeLog for Gentoo/Alpha profile directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/ChangeLog,v 1.178 2013/09/10 16:19:39 ssuominen Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/ChangeLog,v 1.182 2013/10/26 08:55:51 gienah Exp $
26 Oct 2013; Mark Wright <gienah@gentoo.org> package.use.mask:
mask dev-haskell/dataenc test as template-haskell not yet available
21 Oct 2013; Tom Wijsman <TomWij@gentoo.org> package.use.mask:
Added bug reference to media-video/mpv luajit mask.
20 Oct 2013; Tom Wijsman <TomWij@gentoo.org> package.use.mask:
Adjusted media-video/mpv luajit USE mask to support future versions.
16 Oct 2013; Tom Wijsman <TomWij@gentoo.org> package.use.mask:
Mask luajit on ~media-video/mpv-0.2.0 because it only has amd64 x86 keywords.
10 Sep 2013; Samuli Suominen <ssuominen@gentoo.org> package.use.mask: 10 Sep 2013; Samuli Suominen <ssuominen@gentoo.org> package.use.mask:
Remove mask for USE="pam" in sys-auth/polkit since it doesn't have the Remove mask for USE="pam" in sys-auth/polkit since it doesn't have the

View File

@ -1,6 +1,14 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/package.use.mask,v 1.135 2013/09/10 16:19:39 ssuominen Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/package.use.mask,v 1.140 2013/10/26 08:55:51 gienah Exp $
# Mark Wright <gienah@gentoo.org> (26 Oct 2013)
# template-haskell not yet available
dev-haskell/dataenc test
# Tom Wijsman <TomWij@gentoo.org> (16 Oct 2013)
# Mask luajit on ~media-video/mpv-0.2.0 because it only has amd64 x86 keywords. See bug #488318.
>=media-video/mpv-0.2.0 luajit
# Pacho Ramos <pacho@gentoo.org> (01 Sep 2013) # Pacho Ramos <pacho@gentoo.org> (01 Sep 2013)
# CONFIG_AUDITSYSCALL=y is not implemented, bug #438368 # CONFIG_AUDITSYSCALL=y is not implemented, bug #438368
@ -8,12 +16,6 @@ sys-apps/systemd pam
sys-auth/consolekit pam sys-auth/consolekit pam
sys-auth/pambase consolekit sys-auth/pambase consolekit
# Pacho Ramos <pacho@gentoo.org> (25 Jul 2013)
# Missing keywords, bug #444688
>=gnome-base/gnome-control-center-3.8 cups
>=gnome-base/gnome-core-apps-3.8 cups
>=gnome-base/gnome-3.8 cups
# Pacho Ramos <pacho@gentoo.org> (20 Jul 2013) # Pacho Ramos <pacho@gentoo.org> (20 Jul 2013)
# Keywords pending, bug #476710 # Keywords pending, bug #476710
>=gnome-base/gnome-extra-apps-3.8 games >=gnome-base/gnome-extra-apps-3.8 games

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation. # Copyright 1999-2013 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2 # Distributed under the terms of the GNU General Public License, v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/use.mask,v 1.86 2013/08/22 16:07:39 chithanh Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/use.mask,v 1.87 2013/10/19 01:58:37 vapier Exp $
# Unmask the flag which corresponds to ARCH. # Unmask the flag which corresponds to ARCH.
-alpha -alpha
@ -225,3 +225,6 @@ cg
# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013) # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013)
# virtual/opencl is not keyworded # virtual/opencl is not keyworded
opencl opencl
# Unmask once sys-libs/libunwind gets ported & keyworded.
unwind

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/todo/package.use.mask,v 1.334 2013/08/28 18:28:22 aballier Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/todo/package.use.mask,v 1.335 2013/10/12 15:29:55 aballier Exp $
# Mask useflags that require deps with missing keywords. # Mask useflags that require deps with missing keywords.
# Anyone is allowed and _very welcome_ to add masks there. # Anyone is allowed and _very welcome_ to add masks there.
@ -209,3 +209,10 @@ media-gfx/graphviz devil
# sys-apps/util-linux (libuuid) # sys-apps/util-linux (libuuid)
net-misc/wget uuid net-misc/wget uuid
# dev-util/valgrind
dev-libs/eina valgrind
# dev-util/lcov
dev-libs/eina test
dev-libs/eet test

View File

@ -1,6 +1,15 @@
# ChangeLog for Gentoo/AMD64 profile directory # ChangeLog for Gentoo/AMD64 profile directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.230 2013/09/01 22:46:24 jdhore Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.233 2013/10/03 16:27:37 axs Exp $
03 Oct 2013; Ian Stakenvicius <axs@gentoo.org> make.defaults:
swapped USE=abi_x86_64 for ABI_X86=64 per mgorny's recommendation
03 Oct 2013; Michał Górny <mgorny@gentoo.org> make.defaults:
Enable abi_x86_64 globally for packages that don't have it forced-on.
02 Oct 2013; Michał Górny <mgorny@gentoo.org> package.use.force:
Un-force abi_x86_64 on www-plugins/adobe-flash.
01 Sep 2013; Jeff Horelick <jdhore@gentoo.org> package.use.mask: 01 Sep 2013; Jeff Horelick <jdhore@gentoo.org> package.use.mask:
unmask sid for >=media-plugins/audacious-plugins-3.4 unmask sid for >=media-plugins/audacious-plugins-3.4

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/make.defaults,v 1.16 2013/02/01 21:28:56 mgorny Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/make.defaults,v 1.18 2013/10/03 16:27:37 axs Exp $
ARCH="amd64" ARCH="amd64"
ACCEPT_KEYWORDS="${ARCH}" ACCEPT_KEYWORDS="${ARCH}"
@ -38,6 +38,10 @@ CHOST_x32="x86_64-pc-linux-gnux32"
# >=portage-2.1.2_pre3-r4 # >=portage-2.1.2_pre3-r4
USE="mmx sse sse2" USE="mmx sse sse2"
# Michał Górny <mgorny@gentoo.org> (03 Sep 2013)
# Enable abi_x86_64 for packages that don't have it forced.
ABI_X86="64"
# 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org> # 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
# Defaults for video drivers # Defaults for video drivers
VIDEO_CARDS="fbdev glint intel mach64 mga nouveau nv r128 radeon savage sis tdfx trident vesa via vmware voodoo" VIDEO_CARDS="fbdev glint intel mach64 mga nouveau nv r128 radeon savage sis tdfx trident vesa via vmware voodoo"

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-multilib/package.mask,v 1.128 2013/07/10 10:49:39 jer Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-multilib/package.mask,v 1.129 2013/10/14 18:23:43 pacho Exp $
# AMD64 Team <amd64@gentoo.org> # AMD64 Team <amd64@gentoo.org>
# Mask packages that rely on amd64 multilib # Mask packages that rely on amd64 multilib
@ -165,6 +165,8 @@ net-im/skype
net-im/skypetab-ng net-im/skypetab-ng
net-misc/icaclient net-misc/icaclient
net-misc/ps3mediaserver net-misc/ps3mediaserver
net-print/cndrvcups-common-lb
net-print/cndrvcups-lb
sci-biology/foldingathome sci-biology/foldingathome
sci-electronics/eagle sci-electronics/eagle
sci-chemistry/cara-bin sci-chemistry/cara-bin

View File

@ -1,10 +1,11 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.force,v 1.7 2013/03/03 07:34:00 tetromino Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.force,v 1.8 2013/10/02 18:14:17 mgorny Exp $
# Alexandre Rostovtsev <tetromino@gentoo.org> (03 Mar 2013) # Michał Górny <mgorny@gentoo.org> (02 Sep 2013)
# wine64 is optional # Packages with optional 64-bit variant.
app-emulation/wine -abi_x86_64 app-emulation/wine -abi_x86_64
www-plugins/adobe-flash -abi_x86_64
# Diego Elio Pettenò <flameeyes@gmail.com> (21 Apr 2011) # Diego Elio Pettenò <flameeyes@gmail.com> (21 Apr 2011)
# The plugin is 32-bit only (and I'm not even sure if it works with # The plugin is 32-bit only (and I'm not even sure if it works with

View File

@ -1,6 +1,28 @@
# ChangeLog for Gentoo/ARM profile directory # ChangeLog for Gentoo/ARM profile directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/ChangeLog,v 1.269 2013/09/06 17:48:47 pinkbyte Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/ChangeLog,v 1.277 2013/10/31 04:52:11 heroxbd Exp $
31 Oct 2013; Benda Xu <heroxbd@gentoo.org> package.use.mask:
mask USE gtk and guionly of net-p2p/mldonkey, bug #487722
21 Oct 2013; Tom Wijsman <TomWij@gentoo.org> package.use.mask:
Added bug reference to media-video/mpv luajit mask.
20 Oct 2013; Tom Wijsman <TomWij@gentoo.org> package.use.mask:
Adjusted media-video/mpv luajit USE mask to support future versions.
16 Oct 2013; Tom Wijsman <TomWij@gentoo.org> package.use.mask:
Mask luajit on ~media-video/mpv-0.2.0 because it only has amd64 x86 keywords.
05 Oct 2013; Markus Meier <maekke@gentoo.org> package.use.mask:
package.use.mask net-misc/tigervnc[java] for all versions, bug #485436
15 Sep 2013; Markus Meier <maekke@gentoo.org> package.use.mask:
package.use.mask dev-python/ipython[nbconvert], bug #481462
15 Sep 2013; Johannes Huber <johu@gentoo.org> package.use.mask:
Mask use kde-base/solid-runtime[networkmanager], unkeyworded dep
kde-misc/networkmanagement.
06 Sep 2013; Sergey Popov <pinkbyte@gentoo.org> package.use.mask: 06 Sep 2013; Sergey Popov <pinkbyte@gentoo.org> package.use.mask:
Mask USE-flag hdf on dev-perl/PDL Mask USE-flag hdf on dev-perl/PDL

View File

@ -1,6 +1,30 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.use.mask,v 1.169 2013/09/06 17:48:47 pinkbyte Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.use.mask,v 1.179 2013/10/31 07:23:00 pacho Exp $
# Pacho Ramos <pacho@gentoo.org> (31 Oct 2013)
# Missing keywords, bug #478254
gnome-base/gnome classic
# Benda Xu <heroxbd@gentoo.org> (31 Oct 2013)
# Missing keywords from dev-ml/lablgtk, bug #487722
net-p2p/mldonkey gtk guionly
# Tom Wijsman <TomWij@gentoo.org> (16 Oct 2013)
# Mask luajit on ~media-video/mpv-0.2.0 because it only has amd64 x86 keywords. See bug #488318.
>=media-video/mpv-0.2.0 luajit
# Pacho Ramos <pacho@gentoo.org> (22 Sep 2013)
# Missing keywords, bug #484734
media-sound/rhythmbox visualizer
# Markus Meier <maekke@gentoo.org> (15 Sep 2013)
# Unkeyworded deps, bug #481462
dev-python/ipython nbconvert
# Johannes Huber <johu@gentoo.org> (15 Sep 2013)
# Depends on kde-misc/networkmanagement, not keyworded yet.
kde-base/solid-runtime networkmanager
# Sergey Popov <pinkbyte@gentoo.org> (06 Sep 2013) # Sergey Popov <pinkbyte@gentoo.org> (06 Sep 2013)
# sci-libs/hdf does not build properly on arm # sci-libs/hdf does not build properly on arm
@ -105,8 +129,7 @@ dev-vcs/subversion java
=media-libs/libcaca-0.99_beta17 java =media-libs/libcaca-0.99_beta17 java
media-libs/libjpeg-turbo java media-libs/libjpeg-turbo java
net-dns/libidn java net-dns/libidn java
=net-misc/tigervnc-1.1.0-r7 java net-misc/tigervnc java
=net-misc/tigervnc-1.2.0 java
net-print/cups java net-print/cups java
=sys-devel/gettext-0.18.1.1-r1 java =sys-devel/gettext-0.18.1.1-r1 java
=sys-devel/gettext-0.18.1.1-r3 java =sys-devel/gettext-0.18.1.1-r3 java

View File

@ -1,6 +1,15 @@
# ChangeLog for Gentoo/hppa profile # ChangeLog for Gentoo/hppa profile
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/hppa/ChangeLog,v 1.195 2013/08/22 14:13:40 jer Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/arch/hppa/ChangeLog,v 1.198 2013/10/25 15:25:43 jer Exp $
25 Oct 2013; Jeroen Roovers <jer@gentoo.org> use.mask:
Unmask USE=unwind (bug #453704).
25 Oct 2013; Jeroen Roovers <jer@gentoo.org> package.use.mask:
Mask USE=libatomic for sys-libs/libunwind (bug #453704).
14 Oct 2013; Jeroen Roovers <jer@gentoo.org> package.use.mask:
Remove obsolete entry USE=custom-cpuopts.
22 Aug 2013; Jeroen Roovers <jer@gentoo.org> use.mask: 22 Aug 2013; Jeroen Roovers <jer@gentoo.org> use.mask:
Mask USE=opencl (bug #482096). Mask USE=opencl (bug #482096).

View File

@ -1,9 +1,13 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/hppa/package.use.mask,v 1.129 2013/08/11 12:41:43 jer Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/arch/hppa/package.use.mask,v 1.131 2013/10/25 14:52:39 jer Exp $
# DON'T TOUCH THIS FILE. Instead, file a bug and assign it to <hppa@gentoo.org>. # DON'T TOUCH THIS FILE. Instead, file a bug and assign it to <hppa@gentoo.org>.
# Jeroen Roovers <jer@gentoo.org> (25 Oct 2013)
# Building against libatomic_ops fails (bug #453704)
sys-libs/libunwind libatomic
# Jeroen Roovers <jer@gentoo.org> (23 Jul 2013) # Jeroen Roovers <jer@gentoo.org> (23 Jul 2013)
# graphite is not implemented on HPPA # graphite is not implemented on HPPA
sys-devel/gcc graphite sys-devel/gcc graphite
@ -130,7 +134,7 @@ media-sound/mpd fluidsynth
# Jeroen Roovers <jer@gentoo.org> (16 Sep 2008) # Jeroen Roovers <jer@gentoo.org> (16 Sep 2008)
# cpudetection and custom-cpuopts does not apply # cpudetection and custom-cpuopts does not apply
# to HPPA (bug #234629) # to HPPA (bug #234629)
media-video/mplayer cpudetection custom-cpuopts media-video/mplayer cpudetection
# Jeroen Roovers <jer@gentoo.org> (16 Sep 2008) # Jeroen Roovers <jer@gentoo.org> (16 Sep 2008)
# app-text/xindy needs dev-lisp/clisp and clisp does not build (bug #229217) # app-text/xindy needs dev-lisp/clisp and clisp does not build (bug #229217)

View File

@ -1,5 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/hppa/use.mask,v 1.74 2013/08/22 14:13:40 jer Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/arch/hppa/use.mask,v 1.76 2013/10/25 15:25:43 jer Exp $
# DON'T TOUCH THIS FILE. Instead, file a bug and assign it to <hppa@gentoo.org>. # DON'T TOUCH THIS FILE. Instead, file a bug and assign it to <hppa@gentoo.org>.
# Jeroen Roovers <jer@gentoo.org> (22 Aug 2013) # Jeroen Roovers <jer@gentoo.org> (22 Aug 2013)

View File

@ -1,6 +1,12 @@
# ChangeLog for Gentoo/ia64 profile # ChangeLog for Gentoo/ia64 profile
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/ia64/ChangeLog,v 1.194 2013/08/22 16:07:39 chithanh Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/arch/ia64/ChangeLog,v 1.196 2013/10/26 08:52:25 gienah Exp $
26 Oct 2013; Mark Wright <gienah@gentoo.org> package.use.mask:
mask dev-haskell/dataenc test as template-haskell not yet available
28 Sep 2013; Mike Frysinger <vapier@gentoo.org> use.mask:
Mask USE=valgrind since the pkg is not keyworded.
22 Aug 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> use.mask: 22 Aug 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> use.mask:
Mask opencl flag due to lack of virtual/opencl keywording. Mask opencl flag due to lack of virtual/opencl keywording.

View File

@ -1,6 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/ia64/package.use.mask,v 1.125 2013/07/20 11:18:22 pacho Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/arch/ia64/package.use.mask,v 1.126 2013/10/26 08:52:25 gienah Exp $
# Mark Wright <gienah@gentoo.org> (26 Oct 2013)
# template-haskell not yet available
dev-haskell/dataenc test
# Pacho Ramos <pacho@gentoo.org> (20 Jul 2013) # Pacho Ramos <pacho@gentoo.org> (20 Jul 2013)
# Keywords pending, bug #476710 # Keywords pending, bug #476710

View File

@ -52,6 +52,7 @@ upnp
systemd systemd
webm webm
fdk fdk
valgrind
# Stuff we don't want # Stuff we don't want
antlr antlr

View File

@ -1,6 +1,9 @@
# ChangeLog for Gentoo/m68k profile # ChangeLog for Gentoo/m68k profile
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/m68k/ChangeLog,v 1.28 2013/08/22 16:07:40 chithanh Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/arch/m68k/ChangeLog,v 1.29 2013/09/29 14:30:15 dilfridge Exp $
29 Sep 2013; Andreas K. Huettel <dilfridge@gentoo.org> make.defaults:
m68k goes unstable/testing as per concil decision
22 Aug 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> use.mask: 22 Aug 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> use.mask:
Mask opencl flag due to lack of virtual/opencl keywording. Mask opencl flag due to lack of virtual/opencl keywording.

View File

@ -1,9 +1,9 @@
# Copyright 1999-2012 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/m68k/make.defaults,v 1.2 2012/06/16 11:44:12 jlec Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/arch/m68k/make.defaults,v 1.3 2013/09/29 14:30:15 dilfridge Exp $
ARCH="m68k" ARCH="m68k"
ACCEPT_KEYWORDS="m68k" ACCEPT_KEYWORDS="m68k ~m68k"
CHOST="m68k-unknown-linux-gnu" CHOST="m68k-unknown-linux-gnu"
CFLAGS="-O2 -pipe" CFLAGS="-O2 -pipe"

View File

@ -90,3 +90,6 @@ clvm
# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013) # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013)
# virtual/opencl is not keyworded # virtual/opencl is not keyworded
opencl opencl
# Unmask once sys-libs/libunwind gets ported & keyworded.
unwind

View File

@ -1,6 +1,9 @@
# ChangeLog for Gentoo/MIPS profile directory # ChangeLog for Gentoo/MIPS profile directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/ChangeLog,v 1.121 2013/09/02 07:02:22 pinkbyte Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/ChangeLog,v 1.122 2013/10/11 22:27:28 hwoarang Exp $
11 Oct 2013; Markos Chandras <hwoarang@gentoo.org> use.mask:
Mask m17n-lib for MIPS. Bug #485366
02 Sep 2013; Sergey Popov <pinkbyte@gentoo.org> package.use.mask: 02 Sep 2013; Sergey Popov <pinkbyte@gentoo.org> package.use.mask:
Mask webp USE-flag on media-libs/leptonica and app-text/tesseract, not tested Mask webp USE-flag on media-libs/leptonica and app-text/tesseract, not tested

View File

@ -1,10 +1,15 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/use.mask,v 1.68 2013/08/22 16:07:40 chithanh Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/use.mask,v 1.70 2013/10/19 01:58:38 vapier Exp $
# Unmask the flag which corresponds to ARCH. # Unmask the flag which corresponds to ARCH.
-mips -mips
# Markos Chandras <hwoarang@gentoo.org>
# Needs packages that lack ~mips keywords
# See #485366
m17n-lib
# Ryan Hill <dirtyepic@gentoo.org> # Ryan Hill <dirtyepic@gentoo.org>
# Needs sci-mathematics/glpk. # Needs sci-mathematics/glpk.
lpsol lpsol
@ -384,3 +389,6 @@ clvm
# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013) # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013)
# virtual/opencl is not keyworded # virtual/opencl is not keyworded
opencl opencl
# Unmask once sys-libs/libunwind gets keyworded.
unwind

View File

@ -1,6 +1,25 @@
# ChangeLog for Gentoo/PPC profile directory # ChangeLog for Gentoo/PPC profile directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/ChangeLog,v 1.251 2013/08/27 19:27:09 chithanh Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/ChangeLog,v 1.257 2013/10/27 06:22:54 gienah Exp $
25 Oct 2013; Davide Pesavento <pesa@gentoo.org> package.use.force:
Remove obsolete entry.
26 Oct 2013; Mark Wright <gienah@gentoo.org> package.use.mask:
mask dev-haskell/dataenc test as template-haskell not yet available
21 Oct 2013; Tom Wijsman <TomWij@gentoo.org> package.use.mask:
Added bug reference to media-video/mpv luajit mask.
20 Oct 2013; Tom Wijsman <TomWij@gentoo.org> package.use.mask:
Adjusted media-video/mpv luajit USE mask to support future versions.
16 Oct 2013; Tom Wijsman <TomWij@gentoo.org> package.use.mask:
Mask luajit on ~media-video/mpv-0.2.0 because it only has amd64 x86 keywords.
15 Sep 2013; Johannes Huber <johu@gentoo.org> package.use.mask:
Mask use kde-base/solid-runtime[networkmanager], unkeyworded dep
kde-misc/networkmanagement.
27 Aug 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> 27 Aug 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
ppc64/64ul/use.mask, use.mask: ppc64/64ul/use.mask, use.mask:

View File

@ -1,9 +1,3 @@
# Markos Chandras <hwoarang@gentoo.org> (21 Sep 2011)
# dev-libs/botan is not keyworded for ppc64 but it is
# required for qt-creator[-botan-bundled]. So force
# the botan-bundled useflag
dev-qt/qt-creator botan-bundled
# Matti Bickel <mabi@gentoo.org> - 2007-12-31 # Matti Bickel <mabi@gentoo.org> - 2007-12-31
# only the java interface is usable on ppc # only the java interface is usable on ppc
net-p2p/sancho-bin java net-p2p/sancho-bin java

View File

@ -1,6 +1,22 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/package.use.mask,v 1.178 2013/09/08 14:24:18 pacho Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/package.use.mask,v 1.184 2013/10/31 07:23:00 pacho Exp $
# Pacho Ramos <pacho@gentoo.org> (31 Oct 2013)
# Missing keywords, bug #478254
gnome-base/gnome classic
# Mark Wright <gienah@gentoo.org> (26 Oct 2013)
# template-haskell not yet available
dev-haskell/dataenc test
# Tom Wijsman <TomWij@gentoo.org> (16 Oct 2013)
# Mask luajit on ~media-video/mpv-0.2.0 because it only has amd64 x86 keywords. See bug #488318.
>=media-video/mpv-0.2.0 luajit
# Johannes Huber <johu@gentoo.org> (15 Sep 2013)
# # Depends on kde-misc/networkmanagement, not keyworded yet.
kde-base/solid-runtime networkmanager
# Pacho Ramos <pacho@gentoo.org> (08 Sep 2013) # Pacho Ramos <pacho@gentoo.org> (08 Sep 2013)
# monodevelop is not keyworded, bug #468030 # monodevelop is not keyworded, bug #468030

View File

@ -1,6 +1,9 @@
# ChangeLog for Gentoo/s390 profile directory # ChangeLog for Gentoo/s390 profile directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/ChangeLog,v 1.72 2013/08/22 16:07:40 chithanh Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/ChangeLog,v 1.74 2013/09/29 14:34:29 dilfridge Exp $
29 Sep 2013; Andreas K. Huettel <dilfridge@gentoo.org> make.defaults:
s390 goes unstable/testing as per council decision
22 Aug 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> use.mask: 22 Aug 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> use.mask:
Mask opencl flag due to lack of virtual/opencl keywording. Mask opencl flag due to lack of virtual/opencl keywording.

View File

@ -1,9 +1,9 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/make.defaults,v 1.4 2013/01/21 01:57:59 vapier Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/make.defaults,v 1.5 2013/09/29 14:33:58 dilfridge Exp $
ARCH="s390" ARCH="s390"
ACCEPT_KEYWORDS="s390" ACCEPT_KEYWORDS="s390 ~s390"
MULTILIB_ABIS="s390" MULTILIB_ABIS="s390"
DEFAULT_ABI="s390" DEFAULT_ABI="s390"

View File

@ -154,3 +154,6 @@ video_cards_vesa
# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013) # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013)
# virtual/opencl is not keyworded # virtual/opencl is not keyworded
opencl opencl
# Unmask once sys-libs/libunwind gets ported & keyworded.
unwind

View File

@ -1,6 +1,9 @@
# ChangeLog for Gentoo/sh profile directory # ChangeLog for Gentoo/sh profile directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sh/ChangeLog,v 1.90 2013/08/22 16:07:41 chithanh Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/arch/sh/ChangeLog,v 1.91 2013/09/29 14:36:30 dilfridge Exp $
29 Sep 2013; Andreas K. Huettel <dilfridge@gentoo.org> make.defaults:
sh goes unstable/testing as per council decision
22 Aug 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> use.mask: 22 Aug 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> use.mask:
Mask opencl flag due to lack of virtual/opencl keywording. Mask opencl flag due to lack of virtual/opencl keywording.

View File

@ -1,11 +1,11 @@
# Copyright 1999-2012 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sh/make.defaults,v 1.3 2012/06/16 11:44:12 jlec Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/arch/sh/make.defaults,v 1.4 2013/09/29 14:36:30 dilfridge Exp $
# Main SuperH profile # Main SuperH profile
ARCH="sh" ARCH="sh"
ACCEPT_KEYWORDS="sh" ACCEPT_KEYWORDS="sh ~sh"
CHOST="sh-unknown-linux-gnu" CHOST="sh-unknown-linux-gnu"
CFLAGS="-O2" CFLAGS="-O2"

View File

@ -178,3 +178,6 @@ clvm
# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013) # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013)
# virtual/opencl is not keyworded # virtual/opencl is not keyworded
opencl opencl
# Unmask once sys-libs/libunwind gets keyworded.
unwind

View File

@ -1,6 +1,18 @@
# ChangeLog for Gentoo/sparc profile # ChangeLog for Gentoo/sparc profile
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/ChangeLog,v 1.211 2013/08/22 21:09:18 chithanh Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/ChangeLog,v 1.215 2013/10/25 15:19:56 pesa Exp $
25 Oct 2013; Davide Pesavento <pesa@gentoo.org> package.use.mask:
Remove redundant entries (webkit is already use.mask-ed globally on sparc).
21 Oct 2013; Tom Wijsman <TomWij@gentoo.org> package.use.mask:
Added bug reference to media-video/mpv luajit mask.
20 Oct 2013; Tom Wijsman <TomWij@gentoo.org> package.use.mask:
Adjusted media-video/mpv luajit USE mask to support future versions.
16 Oct 2013; Tom Wijsman <TomWij@gentoo.org> package.use.mask:
Mask luajit on ~media-video/mpv-0.2.0 because it only has amd64 x86 keywords.
22 Aug 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> 22 Aug 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
package.use.mask: package.use.mask:

View File

@ -1,17 +1,19 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/package.use.mask,v 1.144 2013/08/22 21:09:18 chithanh Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/package.use.mask,v 1.150 2013/10/26 09:10:58 gienah Exp $
# Mark Wright <gienah@gentoo.org> (26 Oct 2013)
# template-haskell not yet available
dev-haskell/dataenc test
# Tom Wijsman <TomWij@gentoo.org> (16 Oct 2013)
# Mask luajit on ~media-video/mpv-0.2.0 because it only has amd64 x86 keywords. See bug #488318.
>=media-video/mpv-0.2.0 luajit
# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013) # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013)
# dev-libs/jemalloc is not keyworded # dev-libs/jemalloc is not keyworded
www-plugins/gnash jemalloc www-plugins/gnash jemalloc
# Pacho Ramos <pacho@gentoo.org> (25 Jul 2013)
# Missing keywords, bug #444688
>=gnome-base/gnome-control-center-3.8 cups
>=gnome-base/gnome-core-apps-3.8 cups
>=gnome-base/gnome-3.8 cups
# Pacho Ramos <pacho@gentoo.org> (20 Jul 2013) # Pacho Ramos <pacho@gentoo.org> (20 Jul 2013)
# Keywords pending, bug #476710 # Keywords pending, bug #476710
>=gnome-base/gnome-extra-apps-3.8 games >=gnome-base/gnome-extra-apps-3.8 games
@ -67,12 +69,6 @@ gnome-extra/libgda reports
>=dev-db/mysql-5.5 systemtap tcmalloc jemalloc >=dev-db/mysql-5.5 systemtap tcmalloc jemalloc
>=dev-db/mariadb-5.5 systemtap tcmalloc jemalloc >=dev-db/mariadb-5.5 systemtap tcmalloc jemalloc
# Raúl Porcel <armin76@gentoo.org> (08 Jul 2012)
# dev-qt/qtwebkit doesn't seem to work
dev-python/PyQt4 webkit
dev-qt/qtdeclarative webkit
dev-qt/qthelp webkit
# Diego Elio Pettenò <flameeyes@gentoo.org> (24 Jun 2012) # Diego Elio Pettenò <flameeyes@gentoo.org> (24 Jun 2012)
# Requires libpcre with jit # Requires libpcre with jit
www-apache/mod_security jit www-apache/mod_security jit
@ -174,11 +170,6 @@ sci-libs/gdal ecwj2k
# uses games-board/ggz-gtk-client # uses games-board/ggz-gtk-client
games-strategy/freeciv ggz games-strategy/freeciv ggz
# Raúl Porcel <armin76@gentoo.org> (02 Mar 2010)
# needs dev-python/mako which depends on
# dev-python/beaker which sigbuses
media-sound/rhythmbox webkit
# Alexey Shvetsov <alexxy@gentoo.org> (09 Feb 2010) # Alexey Shvetsov <alexxy@gentoo.org> (09 Feb 2010)
# need dev-db/virtuoso-* keyworded # need dev-db/virtuoso-* keyworded
dev-libs/soprano virtuoso dev-libs/soprano virtuoso

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 # Distributed under the terms of the GNU General Public License, v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/use.mask,v 1.112 2013/08/22 16:07:41 chithanh Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/use.mask,v 1.113 2013/10/19 01:58:38 vapier Exp $
# Unmask the flag which corresponds to ARCH. # Unmask the flag which corresponds to ARCH.
-sparc -sparc
@ -332,3 +332,6 @@ cg
# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013) # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013)
# virtual/opencl is not keyworded # virtual/opencl is not keyworded
opencl opencl
# Unmask once sys-libs/libunwind gets ported & keyworded.
unwind

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.mask,v 1.125 2013/09/08 17:08:31 ottxor Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.mask,v 1.126 2013/11/06 21:05:15 pacho Exp $
# This file requires >=portage-2.1.1 # This file requires >=portage-2.1.1
@ -26,10 +26,6 @@ sys-apps/hwloc -cuda -gl -opencl
# Keywords missing, bug #478104 # Keywords missing, bug #478104
>=app-editors/gedit-plugins-3.8.3 git >=app-editors/gedit-plugins-3.8.3 git
# Pacho Ramos <pacho@gentoo.org> (20 Jul 2013)
# Keywords pending, bug #476710
>=gnome-base/gnome-extra-apps-3.8 games
# Anthony G. Basile <blueness@gentoo.org> (18 Jun 2013) # Anthony G. Basile <blueness@gentoo.org> (18 Jun 2013)
# Works on x86 # Works on x86
net-libs/cyassl -aes-ni net-libs/cyassl -aes-ni

View File

@ -1,6 +1,22 @@
# ChangeLog for Gentoo base-profile # ChangeLog for Gentoo base-profile
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.601 2013/09/12 13:37:39 flameeyes Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.606 2013/10/30 19:10:02 mgorny Exp $
30 Oct 2013; Michał Górny <mgorny@gentoo.org> package.use.force:
Copy the forced flags to dev-lang/python-exec (the new name).
27 Oct 2013; Julian Ospald <hasufell@gentoo.org> package.use.mask:
mask luajit useflag for games-action/minetest
25 Oct 2013; Davide Pesavento <pesa@gentoo.org> package.use.force:
Remove obsolete entry.
21 Oct 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
package.use.mask:
Mask mesa i965 driver for security bug #472280.
15 Sep 2013; Tom Wijsman <TomWij@gentoo.org> package.use.mask:
Masked JCE functionality of dev-java/diablo-jdk.
12 Sep 2013; Diego E. Pettenò <flameeyes@gentoo.org> package.use, 12 Sep 2013; Diego E. Pettenò <flameeyes@gentoo.org> package.use,
package.use.force: package.use.force:

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.force,v 1.41 2013/09/12 13:37:39 flameeyes Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.force,v 1.43 2013/10/30 19:10:03 mgorny Exp $
# Michał Gorny <mgorny@gentoo.org> (26 Feb 2013) # Michał Gorny <mgorny@gentoo.org> (26 Feb 2013)
# Meta-packages which use multilib ebuilds always install development # Meta-packages which use multilib ebuilds always install development
@ -15,12 +15,9 @@ app-shells/bash readline
# Michał Górny <mgorny@gentoo.org> (14 Oct 2012) # Michał Górny <mgorny@gentoo.org> (14 Oct 2012)
# Force-enable all PYTHON_TARGETS for python-exec to avoid using private # Force-enable all PYTHON_TARGETS for python-exec to avoid using private
# API. Please remember to keep it in sync with python_targets.desc. # API. Please remember to keep it in sync with python_targets.desc.
dev-lang/python-exec python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_jython2_5 python_targets_jython2_7 python_targets_pypy2_0
dev-python/python-exec python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_jython2_5 python_targets_jython2_7 python_targets_pypy2_0 dev-python/python-exec python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_jython2_5 python_targets_jython2_7 python_targets_pypy2_0
# Davide Pesavento <pesa@gentoo.org> (12 Sep 2012)
# Unbundling code needs updates, will be fixed in 2.7
=dev-qt/qt-creator-2.6* botan-bundled
# Samuli Suominen <ssuominen@gentoo.org> (23 Jan 2012) # Samuli Suominen <ssuominen@gentoo.org> (23 Jan 2012)
# Forcing enabled while waiting for eselect-notify-send wrt #379941 # Forcing enabled while waiting for eselect-notify-send wrt #379941
x11-libs/libnotify symlink x11-libs/libnotify symlink

View File

@ -1,11 +1,25 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.512 2013/09/07 14:50:08 tomwij Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.516 2013/10/30 20:27:37 maksbotan Exp $
# This file requires >=portage-2.1.1 # This file requires >=portage-2.1.1
# New entries go on top. # New entries go on top.
# #
# Julian Ospald <hasufell@gentoo.org> (27 Oct 2013)
# luajit is in ~arch, prepare for minetest stabilization
games-action/minetest luajit
# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (13 Oct 2013)
# Masked for security bug #472280, CVE 2013-1872
<=media-libs/mesa-9.0.3 video_cards_intel video_cards_i965
# Tom Wijsman <TomWij@gentoo.org> (15 Sep 2013)
# Mask JCE functionality of diablo-jdk because it depends on masked sun-jce-bin,
# this needs to be revisited to either be dropped from the Portage tree or to
# use the new way of doing JCE as part of a revision or version bump.
dev-java/diablo-jdk jce
# Tom Wijsman <TomWij@gentoo.org> (7 Sep 2013) # Tom Wijsman <TomWij@gentoo.org> (7 Sep 2013)
# Dependency (www-servers/mongrel) currently only # Dependency (www-servers/mongrel) currently only
# works with Ruby 1.8; so, masking Ruby 1.9 USE flag # works with Ruby 1.8; so, masking Ruby 1.9 USE flag
@ -50,7 +64,8 @@ sys-apps/hwloc cuda gl opencl
# Upstream removed entire support in future release: # Upstream removed entire support in future release:
# http://code.google.com/p/clementine-player/source/detail?r=3d434f1c881890dd77fea6d0e3de3afc86971196 # http://code.google.com/p/clementine-player/source/detail?r=3d434f1c881890dd77fea6d0e3de3afc86971196
# Remove this entry once <=media-sound/clementine-1.1.1 has left the building # Remove this entry once <=media-sound/clementine-1.1.1 has left the building
media-sound/clementine ios ipod media-sound/clementine ios
<media-sound/clementine-1.2.0 ipod
# Ben de Groot <yngwin@gentoo.org> (07 Aug 2013) # Ben de Groot <yngwin@gentoo.org> (07 Aug 2013)
# Newer lightdm doesn't work with current razorqt-lightdm-greeter, bug 479734 # Newer lightdm doesn't work with current razorqt-lightdm-greeter, bug 479734

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation # Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.179 2013/09/05 10:09:05 mgorny Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.180 2013/09/28 09:23:23 pacho Exp $
# masking here and unmasking in default/linux/ # masking here and unmasking in default/linux/
kmod kmod
@ -340,3 +340,11 @@ systemd
# Mask until Qt 5 is in portage. (The flag is here already # Mask until Qt 5 is in portage. (The flag is here already
# to permit the neccessary package preparation.) # to permit the neccessary package preparation.)
qt5 qt5
# Pacho Ramos <pacho@gentoo.org> (28 Sep 2013)
# This USE flag is available after long dicussion in
# http://www.gossamer-threads.com/lists/gentoo/dev/276077
# to let some prople not able to run systemd to skip the dep (#480336).
# Enabling this you will get a fully unsupported Gnome setup that
# could suffer unexpected problem, don't expect support for it then.
openrc-force

View File

@ -1,6 +1,9 @@
# ChangeLog for profile directory # ChangeLog for profile directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/ChangeLog,v 1.158 2013/08/27 22:17:04 aballier Exp $ # $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/ChangeLog,v 1.159 2013/10/14 04:53:56 naota Exp $
14 Oct 2013; Naohiro Aota <naota@gentoo.org> package.use.mask:
Add USE mask for tcpdump. #482930
27 Aug 2013; Alexis Ballier <aballier@gentoo.org> package.use.mask: 27 Aug 2013; Alexis Ballier <aballier@gentoo.org> package.use.mask:
mask app-misc/geoclue skyhook here since networkmanager is masked here mask app-misc/geoclue skyhook here since networkmanager is masked here

Some files were not shown because too many files have changed in this diff Show More