[gentoo-commits] gentoo-x86 commit in dev-ruby/rb-readline: ChangeLog rb-readline-0.5.2.ebuild
graaff 15/01/01 07:53:09
Modified: ChangeLog
Added:rb-readline-0.5.2.ebuild
Log:
Version bump. Fix tests. Add ruby22.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
0x8883FA56A308A8D7!)
Revision ChangesPath
1.3 dev-ruby/rb-readline/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rb-readline/ChangeLog?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rb-readline/ChangeLog?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rb-readline/ChangeLog?r1=1.2&r2=1.3
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/rb-readline/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog 25 Jul 2014 10:49:22 - 1.2
+++ ChangeLog 1 Jan 2015 07:53:09 - 1.3
@@ -1,6 +1,11 @@
# ChangeLog for dev-ruby/rb-readline
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rb-readline/ChangeLog,v 1.2
2014/07/25 10:49:22 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rb-readline/ChangeLog,v 1.3
2015/01/01 07:53:09 graaff Exp $
+
+*rb-readline-0.5.2 (01 Jan 2015)
+
+ 01 Jan 2015; Hans de Graaff +rb-readline-0.5.2.ebuild:
+ Version bump. Fix tests. Add ruby22.
25 Jul 2014; Manuel Rüger rb-readline-0.5.1.ebuild:
Add ruby20, ruby21 targets. 1 Test failing.
1.1 dev-ruby/rb-readline/rb-readline-0.5.2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rb-readline/rb-readline-0.5.2.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rb-readline/rb-readline-0.5.2.ebuild?rev=1.1&content-type=text/plain
Index: rb-readline-0.5.2.ebuild
===
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header:
/var/cvsroot/gentoo-x86/dev-ruby/rb-readline/rb-readline-0.5.2.ebuild,v 1.1
2015/01/01 07:53:09 graaff Exp $
EAPI=5
USE_RUBY="ruby19 ruby20 ruby21 ruby22"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
inherit ruby-fakegem
DESCRIPTION="Ruby implementation of the GNU readline C library"
HOMEPAGE="http://rubygems.org/gems/rb-readline";
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
IUSE=""
all_ruby_prepare() {
# Skip a test that fails when run in the ebuild environment.
sed -i -e '/test_readline_with_default_parameters_does_not_error/,/end/
s:^:#:' test/test_readline.rb || die
}
[gentoo-commits] gentoo-x86 commit in app-shells/bash: bash-4.3_p33.ebuild ChangeLog
vapier 15/01/01 07:27:18
Modified: ChangeLog
Added:bash-4.3_p33.ebuild
Log:
Version bump.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
D2E96200)
Revision ChangesPath
1.427app-shells/bash/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/ChangeLog?rev=1.427&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/ChangeLog?rev=1.427&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/ChangeLog?r1=1.426&r2=1.427
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v
retrieving revision 1.426
retrieving revision 1.427
diff -u -r1.426 -r1.427
--- ChangeLog 9 Nov 2014 20:41:28 - 1.426
+++ ChangeLog 1 Jan 2015 07:27:18 - 1.427
@@ -1,6 +1,11 @@
# ChangeLog for app-shells/bash
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.426
2014/11/09 20:41:28 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.427
2015/01/01 07:27:18 vapier Exp $
+
+*bash-4.3_p33 (01 Jan 2015)
+
+ 01 Jan 2015; Mike Frysinger +bash-4.3_p33.ebuild:
+ Version bump.
*bash-4.3_p30-r1 (09 Nov 2014)
1.1 app-shells/bash/bash-4.3_p33.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/bash-4.3_p33.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/bash-4.3_p33.ebuild?rev=1.1&content-type=text/plain
Index: bash-4.3_p33.ebuild
===
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.3_p33.ebuild,v 1.1
2015/01/01 07:27:18 vapier Exp $
EAPI="4"
inherit eutils flag-o-matic toolchain-funcs multilib
# Official patchlevel
# See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/
PLEVEL=${PV##*_p}
MY_PV=${PV/_p*}
MY_PV=${MY_PV/_/-}
MY_P=${PN}-${MY_PV}
[[ ${PV} != *_p* ]] && PLEVEL=0
patches() {
local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
[[ ${plevel} -eq 0 ]] && return 1
eval set -- {1..${plevel}}
set -- $(printf "${pn}${pv/\.}-%03d " "$@")
if [[ ${opt} == -s ]] ; then
echo "${@/#/${DISTDIR}/}"
else
local u
for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
printf "${u}/${pn}-${pv}-patches/%s " "$@"
done
fi
}
# The version of readline this bash normally ships with.
READLINE_VER="6.3"
DESCRIPTION="The standard GNU Bourne again shell"
HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html";
SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
[[ ${PV} == *_rc* ]] && SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz";
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
DEPEND=">=sys-libs/ncurses-5.2-r2
readline? ( >=sys-libs/readline-${READLINE_VER} )
nls? ( virtual/libintl )"
RDEPEND="${DEPEND}
!
[gentoo-commits] gentoo-x86 commit in games-arcade/bub-n-bros: bub-n-bros-1.6.2.ebuild ChangeLog
mr_bones_15/01/01 06:01:49
Modified: ChangeLog
Added:bub-n-bros-1.6.2.ebuild
Log:
version bump
(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Revision ChangesPath
1.21 games-arcade/bub-n-bros/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/bub-n-bros/ChangeLog?rev=1.21&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/bub-n-bros/ChangeLog?rev=1.21&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/bub-n-bros/ChangeLog?r1=1.20&r2=1.21
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/games-arcade/bub-n-bros/ChangeLog,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ChangeLog 4 May 2010 05:10:24 - 1.20
+++ ChangeLog 1 Jan 2015 06:01:49 - 1.21
@@ -1,6 +1,12 @@
# ChangeLog for games-arcade/bub-n-bros
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/bub-n-bros/ChangeLog,v 1.20
2010/05/04 05:10:24 tupone Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/bub-n-bros/ChangeLog,v 1.21
2015/01/01 06:01:49 mr_bones_ Exp $
+
+*bub-n-bros-1.6.2 (01 Jan 2015)
+
+ 01 Jan 2015; Michael Sterrett
+bub-n-bros-1.6.2.ebuild,
+ +files/bub-n-bros-1.6.2-home.patch:
+ version bump
04 May 2010; Tupone Alfredo bub-n-bros-1.6.ebuild:
Force python2 fixing bug #312231 by arfre...@gentoo.org
1.1 games-arcade/bub-n-bros/bub-n-bros-1.6.2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/bub-n-bros/bub-n-bros-1.6.2.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/bub-n-bros/bub-n-bros-1.6.2.ebuild?rev=1.1&content-type=text/plain
Index: bub-n-bros-1.6.2.ebuild
===
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header:
/var/cvsroot/gentoo-x86/games-arcade/bub-n-bros/bub-n-bros-1.6.2.ebuild,v 1.1
2015/01/01 06:01:49 mr_bones_ Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
inherit eutils python-single-r1 games
MY_P=${P/-n-}
DESCRIPTION="A multiplayer clone of the famous Bubble Bobble game"
HOMEPAGE="http://bub-n-bros.sourceforge.net/";
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
LICENSE="MIT Artistic-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
IUSE=""
DEPEND="dev-python/pygame[${PYTHON_USEDEP}]
${PYTHON_DEPS}"
RDEPEND=${DEPEND}
REQUIRED_USE=${PYTHON_REQUIRED_USE}
S=${WORKDIR}/${MY_P}
pkg_setup() {
python-single-r1_pkg_setup
games_pkg_setup
}
src_prepare() {
ecvs_clean
epatch "${FILESDIR}"/${P}-home.patch
python_fix_shebang .
}
src_compile() {
# Compile the "statesaver" extension module to enable the Clock bonus
cd "${S}"/bubbob
${EPYTHON} setup.py build_ext -i || die
# Compile the extension module required for the X Window client
cd "${S}"/display
${EPYTHON} setup.py build_ext -i || die
# Build images
cd "${S}"/bubbob/images
${EPYTHON} buildcolors.py || die
}
src_install() {
local dir=$(games_get_libdir)/${PN}
exeinto "${dir}"
doexe *.py
insinto "${dir}"
doins -r bubbob common display java http2 metaserver
dodir "${GAMES_BINDIR}"
dosym "${dir}"/BubBob.py "${GAMES_BINDIR}"/bubnbros
python_optimize "${D}${dir}"
newicon http2/data/bob.png ${PN}.png
make_desktop_entry bubnbros Bub-n-Bros
prepgamesdirs
}
[gentoo-commits] gentoo-x86 commit in games-arcade/bub-n-bros/files: bub-n-bros-1.6.2-home.patch
mr_bones_15/01/01 06:01:49
Added:bub-n-bros-1.6.2-home.patch
Log:
version bump
(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Revision ChangesPath
1.1 games-arcade/bub-n-bros/files/bub-n-bros-1.6.2-home.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/bub-n-bros/files/bub-n-bros-1.6.2-home.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/bub-n-bros/files/bub-n-bros-1.6.2-home.patch?rev=1.1&content-type=text/plain
Index: bub-n-bros-1.6.2-home.patch
===
--- bubbob/images.py2007-09-08 17:03:41.0 +0200
+++ bubbob/images.py2007-09-08 17:57:45.0 +0200
@@ -454,7 +454,6 @@
# check and maybe regenerate the colored image files
file = os.path.join('images', 'buildcolors.py')
g = {'__name__': '__auto__', '__file__': file}
-execfile(file, g)
# replace the entries 'filename_%d.ppm' by a family of entries,
# one for each color
sprmap = {}
--- display/pclient.py 2007-09-08 17:03:41.0 +0200
+++ display/pclient.py 2007-09-08 17:57:45.0 +0200
@@ -162,8 +162,8 @@
if mode[-1].has_key('cfgfile'):
self.trackcfgfile = mode[-1]['cfgfile']
else:
-self.trackcfgfile = os.path.join(DataChunk.SOURCEDIR,
- 'http2', 'config.txt')
+self.trackcfgfile = os.path.join(os.environ.get('HOME'),
+ '.bubnbros')
self.udpsock = None
self.udpsock_low = None
self.udpsock2 = None
--- http2/httppages.py 2007-09-08 17:03:41.0 +0200
+++ http2/httppages.py 2007-09-08 17:57:45.0 +0200
@@ -38,7 +38,7 @@
class PageServer:
-CONFIGFILE = 'config.txt'
+CONFIGFILE = '.bubnbros'
localservers = None
def __init__(self, Game):
@@ -46,7 +46,7 @@
self.seed = hex(random.randrange(0x1000, 0x1))
#self.unique_actions = {}
self.localhost = gamesrv.HOSTNAME
-self.filename = os.path.join(LOCALDIR, self.CONFIGFILE)
+self.filename = os.path.join(os.environ.get('HOME'), self.CONFIGFILE)
data = self.loadoptionfile()
self.globaloptions = Options(data.get('*', {}))
self.localoptions = Options(data.get(self.localhost, {}))
@@ -333,7 +333,6 @@
'buildcolors.py')
if os.path.exists(file):
g = {'__name__': '__auto__', '__file__': file}
-execfile(file, g)
if port:
address = '%s:%s' % (host, port)
[gentoo-commits] proj/catalyst:pending commit in: catalyst/targets/
commit: 8dbbd3792cc3de96736a812393ad3f22b14e52af Author: Brian Dolbec gentoo org> AuthorDate: Mon May 27 23:08:16 2013 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 1 05:58:06 2015 + URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=8dbbd379 fix indent. --- catalyst/targets/livecd_stage1.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalyst/targets/livecd_stage1.py b/catalyst/targets/livecd_stage1.py index 6cbd91a..3b19c3f 100644 --- a/catalyst/targets/livecd_stage1.py +++ b/catalyst/targets/livecd_stage1.py @@ -47,7 +47,7 @@ class livecd_stage1(StageBase): os.makedirs(self.settings["target_path"]) def set_spec_prefix(self): - self.settings["spec_prefix"]="livecd" + self.settings["spec_prefix"]="livecd" def set_use(self): StageBase.set_use(self)
[gentoo-commits] proj/catalyst:pending commit in: catalyst/targets/
commit: 9ce3a9131514a1ea831d26a9cedeb5f3fb9677c3
Author: Brian Dolbec gentoo org>
AuthorDate: Mon Feb 25 00:29:52 2013 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Jan 1 05:58:06 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=9ce3a913
Mixed spaces/tabs and indent cleanup.
---
catalyst/targets/livecd_stage2.py | 2 +-
catalyst/targets/netboot.py | 11 +--
catalyst/targets/netboot2.py | 10 +-
catalyst/targets/stage4.py| 18 +-
catalyst/targets/tinderbox.py | 8
5 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/catalyst/targets/livecd_stage2.py
b/catalyst/targets/livecd_stage2.py
index 949ee98..b1cf6b2 100644
--- a/catalyst/targets/livecd_stage2.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -49,7 +49,7 @@ class livecd_stage2(StageBase):
print_traceback=True)
def set_spec_prefix(self):
- self.settings["spec_prefix"]="livecd"
+ self.settings["spec_prefix"]="livecd"
def set_target_path(self):
self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"]+"/")
diff --git a/catalyst/targets/netboot.py b/catalyst/targets/netboot.py
index 7ae1d75..de8dc85 100644
--- a/catalyst/targets/netboot.py
+++ b/catalyst/targets/netboot.py
@@ -122,13 +122,12 @@ class netboot(StageBase):
self.unbind()
raise CatalystError("netboot build aborting due to
error.",
print_traceback=True)
-
# end
print "netboot: build finished !"
def set_action_sequence(self):
- self.settings["action_sequence"]=["unpack","unpack_snapshot",
-
"config_profile_link","setup_confdir","bind","chroot_setup",\
-
"setup_environment","build_packages","build_busybox",\
-
"build_kernel","copy_files_to_image",\
-
"clean","create_netboot_files","unbind","clear_autoresume"]
+ self.settings["action_sequence"]=["unpack","unpack_snapshot",
+
"config_profile_link","setup_confdir","bind","chroot_setup",\
+ "setup_environment","build_packages","build_busybox",\
+ "build_kernel","copy_files_to_image",\
+
"clean","create_netboot_files","unbind","clear_autoresume"]
diff --git a/catalyst/targets/netboot2.py b/catalyst/targets/netboot2.py
index dbbb6a9..e9e2625 100644
--- a/catalyst/targets/netboot2.py
+++ b/catalyst/targets/netboot2.py
@@ -164,8 +164,8 @@ class netboot2(StageBase):
touch(self.settings["autoresume_path"]+"empty")
def set_action_sequence(self):
-
self.settings["action_sequence"]=["unpack","unpack_snapshot","config_profile_link",
-
"setup_confdir","portage_overlay","bind","chroot_setup",\
-
"setup_environment","build_packages","root_overlay",\
-
"copy_files_to_image","setup_overlay","build_kernel","move_kernels",\
-
"remove","empty","unbind","clean","clear_autoresume"]
+
self.settings["action_sequence"]=["unpack","unpack_snapshot","config_profile_link",
+
"setup_confdir","portage_overlay","bind","chroot_setup",\
+ "setup_environment","build_packages","root_overlay",\
+
"copy_files_to_image","setup_overlay","build_kernel","move_kernels",\
+ "remove","empty","unbind","clean","clear_autoresume"]
diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py
index 4aef33f..857976b 100644
--- a/catalyst/targets/stage4.py
+++ b/catalyst/targets/stage4.py
@@ -14,10 +14,10 @@ class stage4(StageBase):
self.required_values=["stage4/packages"]
self.valid_values=self.required_values[:]
self.valid_values.extend(["stage4/use","boot/kernel",\
- "stage4/root_overlay","stage4/fsscript",\
- "stage4/gk_mainargs","splash_theme",\
-
"portage_overlay","stage4/rcadd","stage4/rcdel",\
-
"stage4/linuxrc","stage4/unmerge","stage4/rm","stage4/empty"])
+ "stage4/root_overlay","stage4/fsscript",\
+ "stage4/gk_mainargs","splash_theme",\
+ "portage_overlay","stage4/rcadd","stage4/rcdel",\
+
"stage4/linuxrc","stage4/unmerge","stage4/rm","stage4/empty"])
StageBase.__init__(self,spec,addlargs)
def set_cleanables
[gentoo-commits] proj/catalyst:pending commit in: catalyst/base/
commit: 80493d8d32cb21d622bb2f514da68ac3106b7c35
Author: Brian Dolbec gentoo org>
AuthorDate: Sat Jun 1 06:24:46 2013 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Jan 1 05:58:07 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=80493d8d
Refactor ClearBase code to remove code duplication.
---
catalyst/base/clearbase.py | 73 ++
1 file changed, 29 insertions(+), 44 deletions(-)
diff --git a/catalyst/base/clearbase.py b/catalyst/base/clearbase.py
index 585d4f2..8462a3c 100644
--- a/catalyst/base/clearbase.py
+++ b/catalyst/base/clearbase.py
@@ -41,60 +41,20 @@ class ClearBase(object):
def clear_chroot(self):
- myemp=self.settings["chroot_path"]
- if os.path.isdir(myemp):
- print "Emptying directory",myemp
- """
- stat the dir, delete the dir, recreate the dir and set
- the proper perms and ownership
- """
- mystat=os.stat(myemp)
- #cmd("rm -rf "+myemp, "Could not remove existing file:
"+myemp,env=self.env)
- """ There's no easy way to change flags recursively in
python """
- if os.uname()[0] == "FreeBSD":
- os.system("chflags -R noschg "+myemp)
- shutil.rmtree(myemp)
- ensure_dirs(myemp, mode=0755)
- os.chown(myemp,mystat[ST_UID],mystat[ST_GID])
- os.chmod(myemp,mystat[ST_MODE])
+ print 'Clearing the chroot path ...'
+ self.clear_dir(self.settings["chroot_path"], 0755, True)
def clear_packages(self):
if "pkgcache" in self.settings["options"]:
print "purging the pkgcache ..."
-
- myemp=self.settings["pkgcache_path"]
- if os.path.isdir(myemp):
- print "Emptying directory",myemp
- """
- stat the dir, delete the dir, recreate the dir
and set
- the proper perms and ownership
- """
- mystat=os.stat(myemp)
- #cmd("rm -rf "+myemp, "Could not remove
existing file: "+myemp,env=self.env)
- shutil.rmtree(myemp)
- ensure_dirs(myemp, mode=0755)
- os.chown(myemp,mystat[ST_UID],mystat[ST_GID])
- os.chmod(myemp,mystat[ST_MODE])
+ self.clear_dir(self.settings["pkgcache_path"])
def clear_kerncache(self):
if "kerncache" in self.settings["options"]:
print "purging the kerncache ..."
-
- myemp=self.settings["kerncache_path"]
- if os.path.isdir(myemp):
- print "Emptying directory",myemp
- """
- stat the dir, delete the dir, recreate the dir
and set
- the proper perms and ownership
- """
- mystat=os.stat(myemp)
- #cmd("rm -rf "+myemp, "Could not remove
existing file: "+myemp,env=self.env)
- shutil.rmtree(myemp)
- ensure_dirs(myemp, mode=0755)
- os.chown(myemp,mystat[ST_UID],mystat[ST_GID])
- os.chmod(myemp,mystat[ST_MODE])
+ self.clear_dir(self.settings["kerncache_path"])
def purge(self):
@@ -113,3 +73,28 @@ class ClearBase(object):
print "clearing kerncache ..."
self.clear_kerncache()
+
+ def clear_dir(self, myemp, mode=0755, chg_flags=False):
+ '''Universal directory clearing function
+ '''
+ if not myemp:
+ return False
+ if os.path.isdir(myemp):
+ print "Emptying directory" , myemp
+ """
+ stat the dir, delete the dir, recreate the dir and set
+ the proper perms and ownership
+ """
+ try:
+ mystat=os.stat(myemp)
+ """ There's no easy way to change flags
recursively in python """
+ if chg_flags and os.uname()[0] == "FreeBSD":
+ os.system("chflags -R noschg " + myemp)
+ shutil.rmtree(myemp)
+ ensure
[gentoo-commits] proj/catalyst:pending commit in: catalyst/targets/, catalyst/base/
commit: a1c2785438593104d7c3d2ec20dd4fb25cb19884
Author: Brian Dolbec gentoo org>
AuthorDate: Sat Jun 1 06:23:46 2013 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Jan 1 05:58:07 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=a1c27854
Create AutoResume class to handle all file creation, deletion...
Create catalyst/base/resume.py.
Migrate all auto_resume operations to using the new class.
---
catalyst/base/clearbase.py| 21 +
catalyst/base/resume.py | 166 ++
catalyst/base/stagebase.py| 156 +++
catalyst/targets/grp.py | 4 +-
catalyst/targets/livecd_stage1.py | 4 +-
catalyst/targets/livecd_stage2.py | 14 ++--
catalyst/targets/netboot2.py | 19 +++--
7 files changed, 250 insertions(+), 134 deletions(-)
diff --git a/catalyst/base/clearbase.py b/catalyst/base/clearbase.py
index 8462a3c..0ebe299 100644
--- a/catalyst/base/clearbase.py
+++ b/catalyst/base/clearbase.py
@@ -13,31 +13,14 @@ class ClearBase(object):
"""
def __init__(self, myspec):
self.settings = myspec
-
+ self.resume = None
def clear_autoresume(self):
""" Clean resume points since they are no longer needed """
if "autoresume" in self.settings["options"]:
print "Removing AutoResume Points: ..."
- myemp=self.settings["autoresume_path"]
- if os.path.isdir(myemp):
- if "autoresume" in self.settings["options"]:
- print "Emptying directory",myemp
- """
- stat the dir, delete the dir, recreate the dir
and set
- the proper perms and ownership
- """
- mystat=os.stat(myemp)
- if os.uname()[0] == "FreeBSD":
- cmd("chflags -R noschg "+myemp,\
- "Could not remove immutable
flag for file "\
- +myemp)
- #cmd("rm -rf "+myemp, "Could not remove
existing file: "+myemp,env-self.env)
- shutil.rmtree(myemp)
- ensure_dirs(myemp, 0755)
- os.chown(myemp,mystat[ST_UID],mystat[ST_GID])
- os.chmod(myemp,mystat[ST_MODE])
+ self.resume.clear_all()
def clear_chroot(self):
diff --git a/catalyst/base/resume.py b/catalyst/base/resume.py
new file mode 100644
index 000..e42c7dc
--- /dev/null
+++ b/catalyst/base/resume.py
@@ -0,0 +1,166 @@
+#!/usr/bin/python
+
+# Maintained in full by:
+# Catalyst Team
+# Release Engineering Team
+# Copyright 2013 Brian Dolbec
+
+'''resume.py
+
+Performs autoresume tracking file operations such as
+set, unset, is_set, is_unset, enabled, clear_all
+'''
+
+import os
+import shutil
+from stat import ST_UID, ST_GID, ST_MODE
+import traceback
+
+from catalyst.fileops import ensure_dirs, pjoin, listdir_files
+from catalyst.support import touch
+
+
+class AutoResumeError(Exception):
+ def __init__(self, message, print_traceback=False):
+ if message:
+ if print_traceback:
+ (type,value)=sys.exc_info()[:2]
+ if value!=None:
+ print
+ print "Traceback values found.
listing..."
+ print
traceback.print_exc(file=sys.stdout)
+ print "!!! catalyst: AutoResumeError " + message
+ print
+
+
+class AutoResume(object):
+ '''Class for tracking and handling all aspects of
+ the autoresume option and related files.
+ '''
+
+
+ def __init__(self, basedir, mode=0755):
+ self.basedir = basedir
+ ensure_dirs(basedir, mode=mode, fatal=True)
+ self._points = {}
+ self._init_points_()
+
+
+ def _init_points_(self):
+ '''Internal function which reads the autoresume directory and
+ for existing autoresume points and adds them to our _points
variable
+ '''
+ existing = listdir_files(self.basedir, False)
+ for point in existing:
+ self._points[point] = pjoin(self.basedir, point)
+
+
+ def enable(self, point, data=None):
+ '''Sets the resume point 'ON'
+
+ @param point: string. name of the resume point to enable
+ @param data: string of information to store, or None
+ @return boolean
+
[gentoo-commits] proj/catalyst:pending commit in: targets/support/
commit: 33491e71001e1071e7dc331bd183ff7b0d394ba1
Author: Raúl Porcel gentoo org>
AuthorDate: Wed Dec 24 14:43:51 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Wed Dec 24 14:43:51 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=33491e71
Fix syntax error
---
targets/support/create-iso.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 7454adb..d4fd834 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -10,6 +10,7 @@ case ${clst_hostarch} in
alpha)
cdmaker="genisoimage"
cdmakerpkg="app-cdr/cdrkit"
+ ;;
mips)
cdmaker="sgibootcd"
cdmakerpkg="sys-boot/sgibootcd"
[gentoo-commits] proj/catalyst:pending commit in: catalyst/
commit: 89beddf2ccfb320bac1f8d5b2e5964bf4890ac78
Author: Brian Dolbec gentoo org>
AuthorDate: Thu May 30 19:34:06 2013 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Jan 1 05:58:07 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=89beddf2
Migrate version to use snakeoil's format_version() to append git commit info.
This will make tagging releases easy as well as providing better debug info
while running live versions of the software.
---
catalyst/main.py| 11 +++
catalyst/version.py | 23 +++
2 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/catalyst/main.py b/catalyst/main.py
index 7fea4e7..ae0abae 100644
--- a/catalyst/main.py
+++ b/catalyst/main.py
@@ -14,7 +14,6 @@ import os.path
__selfpath__ = os.path.abspath(os.path.dirname(__file__))
-from . import __version__
import catalyst.config
import catalyst.util
from catalyst.contents import ContentsMap, CONTENTS_DEFINITIONS
@@ -22,6 +21,7 @@ from catalyst.defaults import confdefaults, option_messages
from catalyst.hash_utils import HashMap, HASH_DEFINITIONS
from catalyst.lock import LockInUse
from catalyst.support import CatalystError, find_binary
+from catalyst.version import get_version
conf_values={}
@@ -57,7 +57,7 @@ catalyst -f stage1-specfile.spec
def version():
- print "Catalyst, version "+__version__
+ print get_version()
print "Copyright 2003-2008 Gentoo Foundation"
print "Copyright 2008-2012 various authors"
print "Distributed under the GNU General Public License version 2.1\n"
@@ -169,8 +169,8 @@ def build_target(addlargs):
def main():
- version()
if os.getuid() != 0:
+ version()
# catalyst cannot be run as a normal user due to chroots,
mounts, etc
print "!!! catalyst: This script requires root privileges to
operate"
sys.exit(2)
@@ -204,11 +204,12 @@ def main():
run = False
for o, a in opts:
if o in ("-h", "--help"):
+ version()
usage()
sys.exit(1)
if o in ("-V", "--version"):
- print "Catalyst version "+__version__
+ print get_version()
sys.exit(1)
if o in ("-d", "--debug"):
@@ -264,6 +265,8 @@ def main():
usage()
sys.exit(2)
+ # made it this far so start by outputting our version info
+ version()
# import configuration file and import our main module using those
settings
parse_config(myconfig)
diff --git a/catalyst/version.py b/catalyst/version.py
new file mode 100644
index 000..03c77e4
--- /dev/null
+++ b/catalyst/version.py
@@ -0,0 +1,23 @@
+#!/usr/bin/python -OO
+
+# Maintained in full by:
+# Catalyst Team
+# Release Engineering Team
+# Copyright: 2011 Brian Harring
+# License: BSD/GPL2
+# Copied & edited by: Brian Dolbec
+
+'''Version information and/or git version information
+'''
+
+from snakeoil.version import format_version
+
+__version__="rewrite-git"
+_ver = None
+
+def get_version():
+ """Return: a string describing our version."""
+ global _ver
+ if _ver is None:
+ _ver = format_version('catalyst',__file__, __version__)
+ return _ver
[gentoo-commits] proj/catalyst:pending commit in: catalyst/targets/
commit: a5e07c9892a288eac19062e1c0ee40eb54982476
Author: Brian Dolbec gentoo org>
AuthorDate: Tue Jan 22 00:10:51 2013 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Jan 1 05:58:06 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=a5e07c98
[3 of 3] Rename all target .py files and classes without _target in them.
This is so they are the named the same as the target .sh files
and work with the now simplified module loading.
---
catalyst/targets/{embedded_target.py => embedded.py} | 2 +-
catalyst/targets/{grp_target.py => grp.py} | 2 +-
catalyst/targets/{livecd_stage1_target.py => livecd_stage1.py} | 2 +-
catalyst/targets/{livecd_stage2_target.py => livecd_stage2.py} | 2 +-
catalyst/targets/{netboot_target.py => netboot.py} | 2 +-
catalyst/targets/{netboot2_target.py => netboot2.py} | 2 +-
catalyst/targets/{stage1_target.py => stage1.py} | 2 +-
catalyst/targets/{stage2_target.py => stage2.py} | 2 +-
catalyst/targets/{stage3_target.py => stage3.py} | 2 +-
catalyst/targets/{stage4_target.py => stage4.py} | 2 +-
catalyst/targets/{tinderbox_target.py => tinderbox.py} | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/catalyst/targets/embedded_target.py b/catalyst/targets/embedded.py
similarity index 98%
rename from catalyst/targets/embedded_target.py
rename to catalyst/targets/embedded.py
index aee0f00..3309278 100644
--- a/catalyst/targets/embedded_target.py
+++ b/catalyst/targets/embedded.py
@@ -15,7 +15,7 @@ from catalyst.support import normpath
from catalyst.base.stagebase import StageBase
-class embedded_target(StageBase):
+class embedded(StageBase):
"""
Builder class for embedded target
"""
diff --git a/catalyst/targets/grp_target.py b/catalyst/targets/grp.py
similarity index 99%
rename from catalyst/targets/grp_target.py
rename to catalyst/targets/grp.py
index e3f08a2..0075714 100644
--- a/catalyst/targets/grp_target.py
+++ b/catalyst/targets/grp.py
@@ -14,7 +14,7 @@ from catalyst.support import (CatalystError, normpath,
from catalyst.base.stagebase import StageBase
-class grp_target(StageBase):
+class grp(StageBase):
"""
The builder class for GRP (Gentoo Reference Platform) builds.
"""
diff --git a/catalyst/targets/livecd_stage1_target.py
b/catalyst/targets/livecd_stage1.py
similarity index 98%
rename from catalyst/targets/livecd_stage1_target.py
rename to catalyst/targets/livecd_stage1.py
index 9c74253..661e06e 100644
--- a/catalyst/targets/livecd_stage1_target.py
+++ b/catalyst/targets/livecd_stage1.py
@@ -13,7 +13,7 @@ from catalyst.support import (normpath,
from catalyst.base.stagebase import StageBase
-class livecd_stage1_target(StageBase):
+class livecd_stage1(StageBase):
"""
Builder class for LiveCD stage1.
"""
diff --git a/catalyst/targets/livecd_stage2_target.py
b/catalyst/targets/livecd_stage2.py
similarity index 99%
rename from catalyst/targets/livecd_stage2_target.py
rename to catalyst/targets/livecd_stage2.py
index a4630e6..20f6014 100644
--- a/catalyst/targets/livecd_stage2_target.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -10,7 +10,7 @@ from catalyst.support import (normpath, file_locate,
CatalystError, cmd,
from catalyst.base.stagebase import StageBase
-class livecd_stage2_target(StageBase):
+class livecd_stage2(StageBase):
"""
Builder class for a LiveCD stage2 build.
"""
diff --git a/catalyst/targets/netboot_target.py b/catalyst/targets/netboot.py
similarity index 99%
rename from catalyst/targets/netboot_target.py
rename to catalyst/targets/netboot.py
index 9d92ef2..f753c7f 100644
--- a/catalyst/targets/netboot_target.py
+++ b/catalyst/targets/netboot.py
@@ -12,7 +12,7 @@ from catalyst.support import (CatalystError, normpath,
from catalyst.base.stagebase import StageBase
-class netboot_target(StageBase):
+class netboot(StageBase):
"""
Builder class for a netboot build.
"""
diff --git a/catalyst/targets/netboot2_target.py b/catalyst/targets/netboot2.py
similarity index 99%
rename from catalyst/targets/netboot2_target.py
rename to catalyst/targets/netboot2.py
index 130e2b6..fc8c64c 100644
--- a/catalyst/targets/netboot2_target.py
+++ b/catalyst/targets/netboot2.py
@@ -14,7 +14,7 @@ from catalyst.support import (CatalystError, normpath,
from catalyst.base.stagebase import StageBase
-class netboot2_target(StageBase):
+class netboot2(StageBase):
"""
Builder class for a netboot build, version 2
"""
diff --git a/catalyst/targets/stage1_target.py b/catalyst/targets/stage1.py
similarity index 99%
rename from catalyst/targets/stage1_target.py
rename to catalyst/targets/stage1.py
index 2329b58..e72cbcc 100644
--- a/catalyst/targets/stage1_target.py
+++ b/catalyst/targets/stage1.py
@@ -9,7 +9,7 @@ from ca
[gentoo-commits] proj/catalyst:pending commit in: catalyst/, catalyst/base/, catalyst/targets/
commit: f98b415f062b624bde02d48768372c9848abe175
Author: Brian Dolbec gentoo org>
AuthorDate: Fri May 31 16:11:30 2013 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Jan 1 05:58:07 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=f98b415f
Initial creation of fileops.py
Migrate to using ensure_dirs()
---
catalyst/base/clearbase.py| 10 -
catalyst/base/stagebase.py| 32 +++-
catalyst/fileops.py | 45 +++
catalyst/targets/grp.py | 5 ++---
catalyst/targets/livecd_stage1.py | 4 ++--
catalyst/targets/livecd_stage2.py | 13 ---
catalyst/targets/netboot2.py | 6 +++---
catalyst/targets/snapshot.py | 10 -
catalyst/targets/stage1.py| 10 -
9 files changed, 81 insertions(+), 54 deletions(-)
diff --git a/catalyst/base/clearbase.py b/catalyst/base/clearbase.py
index 8519acc..585d4f2 100644
--- a/catalyst/base/clearbase.py
+++ b/catalyst/base/clearbase.py
@@ -5,7 +5,7 @@ from stat import ST_UID, ST_GID, ST_MODE
from catalyst.support import cmd, countdown
-
+from catalyst.fileops import ensure_dirs
class ClearBase(object):
"""
@@ -35,7 +35,7 @@ class ClearBase(object):
+myemp)
#cmd("rm -rf "+myemp, "Could not remove
existing file: "+myemp,env-self.env)
shutil.rmtree(myemp)
- os.makedirs(myemp,0755)
+ ensure_dirs(myemp, 0755)
os.chown(myemp,mystat[ST_UID],mystat[ST_GID])
os.chmod(myemp,mystat[ST_MODE])
@@ -54,7 +54,7 @@ class ClearBase(object):
if os.uname()[0] == "FreeBSD":
os.system("chflags -R noschg "+myemp)
shutil.rmtree(myemp)
- os.makedirs(myemp,0755)
+ ensure_dirs(myemp, mode=0755)
os.chown(myemp,mystat[ST_UID],mystat[ST_GID])
os.chmod(myemp,mystat[ST_MODE])
@@ -73,7 +73,7 @@ class ClearBase(object):
mystat=os.stat(myemp)
#cmd("rm -rf "+myemp, "Could not remove
existing file: "+myemp,env=self.env)
shutil.rmtree(myemp)
- os.makedirs(myemp,0755)
+ ensure_dirs(myemp, mode=0755)
os.chown(myemp,mystat[ST_UID],mystat[ST_GID])
os.chmod(myemp,mystat[ST_MODE])
@@ -92,7 +92,7 @@ class ClearBase(object):
mystat=os.stat(myemp)
#cmd("rm -rf "+myemp, "Could not remove
existing file: "+myemp,env=self.env)
shutil.rmtree(myemp)
- os.makedirs(myemp,0755)
+ ensure_dirs(myemp, mode=0755)
os.chown(myemp,mystat[ST_UID],mystat[ST_GID])
os.chmod(myemp,mystat[ST_MODE])
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 3056ce2..40c7362 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -18,6 +18,7 @@ from catalyst.base.targetbase import TargetBase
from catalyst.base.clearbase import ClearBase
from catalyst.base.genbase import GenBase
from catalyst.lock import LockDir
+from catalyst.fileops import ensure_dirs, pjoin
class StageBase(TargetBase, ClearBase, GenBase):
@@ -339,8 +340,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
#
+self.settings["target_path"],env=self.env)
touch(setup_target_path_resume)
- if not
os.path.exists(self.settings["storedir"]+"/builds/"):
-
os.makedirs(self.settings["storedir"]+"/builds/")
+ ensure_dirs(self.settings["storedir"] + "/builds/")
def set_fsscript(self):
if self.settings["spec_prefix"]+"/fsscript" in self.settings:
@@ -486,8 +486,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
))
if "autoresume" in self.settings["options"]:
print "The autoresume path is " +
self.settings["autoresume_path"]
- if not os.path.exists(self.settings["autoresume_path"]):
- os.makedirs(self.settings["autoresume_path"],0755)
+ ensure_dirs(self.settings["autoresume_path"], mode=0755)
def set_controller_file(self):
self.settings["controller_file"]=normpath(self.settings["sharedir"]+\
@@ -769,19 +768,15 @@ class StageBase(TargetBase, ClearBase, GenBase):
[gentoo-commits] proj/catalyst:pending commit in: catalyst/base/, catalyst/
commit: 6f01be26fb22e2b9c89453f9a4d2eeba2babf6e6
Author: Brian Dolbec gentoo org>
AuthorDate: Tue Jan 22 08:39:18 2013 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Jan 1 05:58:06 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=6f01be26
Rename a make.conf key to make_conf due to bash variable name restrictions
---
catalyst/base/stagebase.py | 10 +-
catalyst/defaults.py | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index b44a957..96b1c19 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1020,7 +1020,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
def chroot_setup(self):
self.makeconf=read_makeconf(normpath(self.settings["chroot_path"]+
- self.settings["make.conf"]))
+ self.settings["make_conf"]))
self.override_cbuild()
self.override_chost()
self.override_cflags()
@@ -1068,7 +1068,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
""" Modify and write out make.conf (for the chroot) """
makepath = normpath(self.settings["chroot_path"] +
- self.settings["make.conf"])
+ self.settings["make_conf"])
cmd("rm -f " + makepath,\
"Could not remove " + makepath, env=self.env)
myf=open(makepath, "w")
@@ -1122,9 +1122,9 @@ class StageBase(TargetBase, ClearBase, GenBase):
myf.close()
makepath = normpath(self.settings["chroot_path"] +
- self.settings["make.conf"])
+ self.settings["make_conf"])
cmd("cp " + makepath + " " + makepath + ".catalyst",\
- "Could not backup " +
self.settings["make.conf"],env=self.env)
+ "Could not backup " +
self.settings["make_conf"],env=self.env)
touch(self.settings["autoresume_path"]+"chroot_setup")
def fsscript(self):
@@ -1172,7 +1172,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
cmd("rm -rf " + self.settings["chroot_path"] +
self.settings["local_overlay"],
"Could not remove " +
self.settings["local_overlay"], env=self.env)
cmd("sed -i '/^PORTDIR_OVERLAY/d'
"+self.settings["chroot_path"]+\
- "/etc/portage/make.conf",\
+ self.settings["make_conf"],\
"Could not remove PORTDIR_OVERLAY from
make.conf",env=self.env)
""" Clean up old and obsoleted files in /etc """
diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index ce7e919..2839a3d 100644
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -25,8 +25,8 @@ confdefaults={
"hash_function": "crc32",
"icecream": "/var/cache/icecream",
"local_overlay": "/usr/local/portage",
- "make.conf": "/etc/portage/make.conf",
- "options": "",
+ "make_conf": "/etc/portage/make.conf",
+ "options": set(),
"packagedir": "/usr/portage/packages",
"portdir": "/usr/portage",
"port_tmpdir": "/var/tmp/portage",
[gentoo-commits] proj/catalyst:pending commit in: catalyst/targets/, catalyst/
commit: d4bc8e3c5ba7bca5656ea597e3ad013a4e61c8b5
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 20 08:10:03 2013 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Jan 1 05:58:05 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=d4bc8e3c
Begin splitting up generic_stage_target into smaller code blocks.
This so snapshot_target does not need to import it since most of it was
not used or initialized properly.
---
catalyst/defaults.py | 2 +-
catalyst/targets/clearbase.py | 115 ++
catalyst/targets/genbase.py| 58 +++
catalyst/targets/generic_stage_target.py | 167 +++--
catalyst/targets/snapshot_target.py| 16 +-
.../targets/{generic_target.py => targetbase.py} | 6 +-
6 files changed, 208 insertions(+), 156 deletions(-)
diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index b36eff7..f6b2163 100644
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -1,7 +1,7 @@
# these should never be touched
-required_build_targets = ["generic_target", "generic_stage_target"]
+required_build_targets = ["targetbase", "generic_stage_target"]
# new build types should be added here
valid_build_targets = ["stage1_target", "stage2_target", "stage3_target",
diff --git a/catalyst/targets/clearbase.py b/catalyst/targets/clearbase.py
new file mode 100644
index 000..8519acc
--- /dev/null
+++ b/catalyst/targets/clearbase.py
@@ -0,0 +1,115 @@
+
+import os
+import shutil
+from stat import ST_UID, ST_GID, ST_MODE
+
+
+from catalyst.support import cmd, countdown
+
+
+class ClearBase(object):
+ """
+ This class does all of clearing after task completion
+ """
+ def __init__(self, myspec):
+ self.settings = myspec
+
+
+
+ def clear_autoresume(self):
+ """ Clean resume points since they are no longer needed """
+ if "autoresume" in self.settings["options"]:
+ print "Removing AutoResume Points: ..."
+ myemp=self.settings["autoresume_path"]
+ if os.path.isdir(myemp):
+ if "autoresume" in self.settings["options"]:
+ print "Emptying directory",myemp
+ """
+ stat the dir, delete the dir, recreate the dir
and set
+ the proper perms and ownership
+ """
+ mystat=os.stat(myemp)
+ if os.uname()[0] == "FreeBSD":
+ cmd("chflags -R noschg "+myemp,\
+ "Could not remove immutable
flag for file "\
+ +myemp)
+ #cmd("rm -rf "+myemp, "Could not remove
existing file: "+myemp,env-self.env)
+ shutil.rmtree(myemp)
+ os.makedirs(myemp,0755)
+ os.chown(myemp,mystat[ST_UID],mystat[ST_GID])
+ os.chmod(myemp,mystat[ST_MODE])
+
+
+ def clear_chroot(self):
+ myemp=self.settings["chroot_path"]
+ if os.path.isdir(myemp):
+ print "Emptying directory",myemp
+ """
+ stat the dir, delete the dir, recreate the dir and set
+ the proper perms and ownership
+ """
+ mystat=os.stat(myemp)
+ #cmd("rm -rf "+myemp, "Could not remove existing file:
"+myemp,env=self.env)
+ """ There's no easy way to change flags recursively in
python """
+ if os.uname()[0] == "FreeBSD":
+ os.system("chflags -R noschg "+myemp)
+ shutil.rmtree(myemp)
+ os.makedirs(myemp,0755)
+ os.chown(myemp,mystat[ST_UID],mystat[ST_GID])
+ os.chmod(myemp,mystat[ST_MODE])
+
+
+ def clear_packages(self):
+ if "pkgcache" in self.settings["options"]:
+ print "purging the pkgcache ..."
+
+ myemp=self.settings["pkgcache_path"]
+ if os.path.isdir(myemp):
+ print "Emptying directory",myemp
+ """
+ stat the dir, delete the dir, recreate the dir
and set
+ the proper perms and ownership
+ """
+ mystat=os.stat(myemp)
+ #cmd("rm -rf "+myemp, "Could not remove
existing file: "+myemp,env=self.env)
+
[gentoo-commits] proj/catalyst:pending commit in: catalyst/
commit: cd9ed84add5379f07f46faea102f24ec51754f54
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 20 01:50:26 2013 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Jan 1 05:58:05 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=cd9ed84a
Move LockInUse from support.py to lock.py, fix bad execption raising, pyflakes
cleanup
---
catalyst/lock.py| 55 ++---
catalyst/main.py| 3 ++-
catalyst/support.py | 11 ---
3 files changed, 33 insertions(+), 36 deletions(-)
diff --git a/catalyst/lock.py b/catalyst/lock.py
index 2d10d2f..78968cb 100644
--- a/catalyst/lock.py
+++ b/catalyst/lock.py
@@ -3,14 +3,26 @@ import os
import fcntl
import errno
import sys
-import string
import time
-from catalyst.support import *
+from catalyst.support import CatalystError, normpath
def writemsg(mystr):
sys.stderr.write(mystr)
sys.stderr.flush()
+
+class LockInUse(Exception):
+ def __init__(self, message):
+ if message:
+ #(type,value)=sys.exc_info()[:2]
+ #if value!=None:
+ #print
+ #kprint traceback.print_exc(file=sys.stdout)
+ print
+ print "!!! catalyst lock file in use: "+message
+ print
+
+
class LockDir:
locking_method=fcntl.flock
lock_dirs_in_use=[]
@@ -109,7 +121,8 @@ class LockDir:
def fcntl_lock(self,locktype):
if self.myfd==None:
if not os.path.exists(os.path.dirname(self.lockdir)):
- raise DirectoryNotFound,
os.path.dirname(self.lockdir)
+ raise CatalystError("DirectoryNotFound: %s"
+ % os.path.dirname(self.lockdir))
if not os.path.exists(self.lockfile):
old_mask=os.umask(000)
self.myfd = os.open(self.lockfile,
os.O_CREAT|os.O_RDWR,0660)
@@ -168,7 +181,7 @@ class LockDir:
print "lockfile does not exist '%s'" % self.lockfile
if (self.myfd != None):
try:
- os.close(myfd)
+ os.close(self.myfd)
self.myfd=None
except:
pass
@@ -251,12 +264,13 @@ class LockDir:
self.add_hardlock_file_to_cleanup()
if not os.path.exists(self.myhardlock):
- raise FileNotFound, "Created lockfile is
missing: %(filename)s" % {"filename":self.myhardlock}
+ raise CatalystError("FileNotFound: Created
lockfile is missing: "
+ "%(filename)s" %
{"filename":self.myhardlock})
try:
- res = os.link(self.myhardlock, self.lockfile)
- except SystemExit, e:
+ os.link(self.myhardlock, self.lockfile)
+ except SystemExit:
raise
- except Exception, e:
+ except Exception:
# if "DEBUG" in self.settings:
# print "lockfile(): Hardlink: Link
failed."
# print "Exception: ",e
@@ -286,7 +300,7 @@ class LockDir:
os.unlink(self.myhardlock)
if os.path.exists(self.lockfile):
os.unlink(self.lockfile)
- except SystemExit, e:
+ except SystemExit:
raise
except:
writemsg("Something strange happened to our hardlink
locks.\n")
@@ -314,7 +328,7 @@ class LockDir:
try:
myhls = os.stat(link)
mylfs = os.stat(lock)
- except SystemExit, e:
+ except SystemExit:
raise
except:
myhls = None
@@ -340,7 +354,7 @@ class LockDir:
pass
def hardlock_cleanup(self,path):
- mypid = str(os.getpid())
+ #mypid = str(os.getpid())
myhost = os.uname()[1]
mydl = os.listdir(path)
results = []
@@ -384,26 +398,26 @@ class LockDir:
# We're
sweeping through, unlinking everyone's locks.
os.unlink(filename)
[gentoo-commits] proj/catalyst:pending commit in: catalyst/targets/, catalyst/
commit: 36610754ba2daca723064021001c5128d83e8f21
Author: Brian Dolbec gentoo org>
AuthorDate: Tue Feb 12 03:43:37 2013 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Jan 1 05:58:05 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=36610754
Remove redundant /bin/bash additions in cmd() calls
Remove old spawn_* functions copied from portage.
cmd() now uses subprocess.Popen().
---
catalyst/support.py | 301 +++
catalyst/targets/generic_stage_target.py | 26 +--
catalyst/targets/grp_target.py | 2 +-
catalyst/targets/netboot2_target.py | 4 +-
catalyst/targets/netboot_target.py | 8 +-
catalyst/targets/tinderbox_target.py | 2 +-
6 files changed, 42 insertions(+), 301 deletions(-)
diff --git a/catalyst/support.py b/catalyst/support.py
index e2d64a1..aaacaa9 100644
--- a/catalyst/support.py
+++ b/catalyst/support.py
@@ -4,9 +4,10 @@ import string
import os
import types
import re
-import signal
import traceback
import time
+from subprocess import Popen
+
from catalyst.defaults import verbosity, valid_config_file_values
@@ -31,34 +32,6 @@ except:
spawned_pids = []
-def cleanup(pids,block_exceptions=True):
- """function to go through and reap the list of pids passed to it"""
- global spawned_pids
- if type(pids) == int:
- pids = [pids]
- for x in pids:
- try:
- os.kill(x,signal.SIGTERM)
- if os.waitpid(x,os.WNOHANG)[1] == 0:
- # feisty bugger, still alive.
- os.kill(x,signal.SIGKILL)
- os.waitpid(x,0)
- except OSError, oe:
- if block_exceptions:
- pass
- if oe.errno not in (10,3):
- raise oe
- except SystemExit:
- raise
- except Exception:
- if block_exceptions:
- pass
- try:
- spawned_pids.remove(x)
- except IndexError:
- pass
-
-
# a function to turn a string of non-printable characters
# into a string of hex characters
def hexify(str):
@@ -79,8 +52,8 @@ def read_from_clst(file):
return -1
#raise CatalystError, "Could not open file "+file
for line in myf.readlines():
- #line = string.replace(line, "\n", "") # drop newline
- myline = myline + line
+ #line = string.replace(line, "\n", "") # drop newline
+ myline = myline + line
myf.close()
return myline
@@ -145,259 +118,27 @@ def find_binary(myc):
return None
-def spawn_bash(mycommand,env={},debug=False,opt_name=None,**keywords):
- """spawn mycommand as an arguement to bash"""
- args=[BASH_BINARY]
- if not opt_name:
- opt_name=mycommand.split()[0]
- if "BASH_ENV" not in env:
- env["BASH_ENV"] = "/etc/spork/is/not/valid/profile.env"
- if debug:
- args.append("-x")
- args.append("-c")
- args.append(mycommand)
- return spawn(args,env=env,opt_name=opt_name,**keywords)
-
-
-def spawn_get_output(mycommand,raw_exit_code=False,emulate_gso=True, \
- collect_fds=[1],fd_pipes=None,**keywords):
- """call spawn, collecting the output to fd's specified in collect_fds
list
- emulate_gso is a compatability hack to emulate
commands.getstatusoutput's return, minus the
- requirement it always be a bash call (spawn_type controls the actual
spawn call), and minus the
- 'lets let log only stdin and let stderr slide by'.
-
- emulate_gso was deprecated from the day it was added, so convert your
code over.
- spawn_type is the passed in function to call- typically spawn_bash,
spawn, spawn_sandbox, or spawn_fakeroot"""
- global selinux_capable
- pr,pw=os.pipe()
-
- if fd_pipes==None:
- fd_pipes={}
- fd_pipes[0] = 0
-
- for x in collect_fds:
- fd_pipes[x] = pw
- keywords["returnpid"]=True
-
- mypid=spawn_bash(mycommand,fd_pipes=fd_pipes,**keywords)
- os.close(pw)
- if type(mypid) != types.ListType:
- os.close(pr)
- return [mypid, "%s: No such file or directory" %
mycommand.split()[0]]
-
- fd=os.fdopen(pr,"r")
- mydata=fd.readlines()
- fd.close()
- if emulate_gso:
- mydata=string.join(mydata)
- if len(mydata) and mydata[-1] == "\n":
- mydata=mydata[:-1]
- retval=os.waitpid(mypid[0],0)[1]
- cleanup(mypid)
- if raw_
[gentoo-commits] proj/catalyst:pending commit in: catalyst/
commit: c9f2dd369d57ab4b963753de125fbcad3e3582fc Author: Brian Dolbec gentoo org> AuthorDate: Tue Jan 22 08:34:41 2013 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 1 05:58:06 2015 + URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=c9f2dd36 FIXME! Comment out a small code block causing TypeError. This was also short circuiting another large code block. FIXME This whole class seems overly complicated with TOO MANY nested try:excepts: --- catalyst/lock.py | 23 +-- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/catalyst/lock.py b/catalyst/lock.py index 78968cb..c90f5b8 100644 --- a/catalyst/lock.py +++ b/catalyst/lock.py @@ -27,11 +27,17 @@ class LockDir: locking_method=fcntl.flock lock_dirs_in_use=[] die_on_failed_lock=True + def __del__(self): + #print "Lock.__del__() 1" self.clean_my_hardlocks() + #print "Lock.__del__() 2" self.delete_lock_from_path_list() + #print "Lock.__del__() 3" if self.islocked(): + #print "Lock.__del__() 4" self.fcntl_unlock() + #print "Lock.__del__() finnished" def __init__(self,lockdir): self.locked=False @@ -179,7 +185,9 @@ class LockDir: unlinkfile = 1 if not os.path.exists(self.lockfile): print "lockfile does not exist '%s'" % self.lockfile + #print "fcntl_unlock() , self.myfd:", self.myfd, type(self.myfd) if (self.myfd != None): + #print "fcntl_unlock() trying to close it " try: os.close(self.myfd) self.myfd=None @@ -193,11 +201,13 @@ class LockDir: unlinkfile = 1 self.locking_method(self.myfd,fcntl.LOCK_UN) except SystemExit, e: - raise + raise e except Exception, e: - os.close(self.myfd) - self.myfd=None - raise IOError, "Failed to unlock file '%s'\n" % self.lockfile + #if self.myfd is not None: + #print "fcntl_unlock() trying to close", self.myfd + #os.close(self.myfd) + #self.myfd=None + #raise IOError, "Failed to unlock file '%s'\n%s" % (self.lockfile, str(e)) try: # This sleep call was added to allow other processes that are # waiting for a lock to be able to grab it before it is deleted. @@ -224,7 +234,7 @@ class LockDir: # if "DEBUG" in self.settings: # print "Unlinked lockfile..." except SystemExit, e: - raise + raise e except Exception, e: # We really don't care... Someone else has the lock. # So it is their problem now. @@ -236,7 +246,7 @@ class LockDir: # open fd closed automatically on them. #if type(lockfilename) == types.StringType: #os.close(myfd) - + #print "fcntl_unlock() trying a last ditch close", self.myfd if (self.myfd != None): os.close(self.myfd) self.myfd=None @@ -421,6 +431,7 @@ class LockDir: pass return results + if __name__ == "__main__": def lock_work():
[gentoo-commits] proj/catalyst:pending commit in: catalyst/base/, catalyst/
commit: a519c380faabe8278863d4615e24194d17c78c75
Author: Brian Dolbec gentoo org>
AuthorDate: Mon Feb 25 03:52:44 2013 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Jan 1 05:58:06 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=a519c380
Fix typo in error message, clean up useless tracebacks
Remove useless python tracebacks for bash side target failures.
Conflicts:
catalyst/main.py
---
catalyst/base/stagebase.py | 2 +-
catalyst/main.py | 2 --
catalyst/support.py| 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index c16ef86..3056ce2 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1296,7 +1296,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
except CatalystError:
self.unbind()
raise CatalystError("Stage build aborting due
to error.",
- print_traceback=True)
+ print_traceback=False)
def setup_environment(self):
"""
diff --git a/catalyst/main.py b/catalyst/main.py
index 56e57c6..7fea4e7 100644
--- a/catalyst/main.py
+++ b/catalyst/main.py
@@ -163,8 +163,6 @@ def build_target(addlargs):
try:
target.run()
except:
- print "Target run() exception: Python traceback output
follows:"
- catalyst.util.print_traceback()
print "!!! catalyst: Error encountered during run of target " +
\
addlargs["target"]
sys.exit(1)
diff --git a/catalyst/support.py b/catalyst/support.py
index 8c4876f..8f2e5df 100644
--- a/catalyst/support.py
+++ b/catalyst/support.py
@@ -90,7 +90,7 @@ class CatalystError(Exception):
(type,value)=sys.exc_info()[:2]
if value!=None:
print
- print "Traceback valuse found.
listing..."
+ print "Traceback values found.
listing..."
print
traceback.print_exc(file=sys.stdout)
print
print "!!! catalyst: "+message
[gentoo-commits] proj/catalyst:pending commit in: catalyst/targets/, catalyst/base/
commit: 5fa2b2a910c45401f132e7ed7e9da9a993762252
Author: Brian Dolbec gentoo org>
AuthorDate: Tue Feb 12 03:51:52 2013 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Jan 1 05:58:05 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=5fa2b2a9
[1 of 3] Move base stage and target files to thier own sub-pkg
Fix an indent error in grp_target.py
---
catalyst/base/__init__.py | 1 +
catalyst/{targets => base}/clearbase.py| 0
catalyst/{targets => base}/genbase.py | 0
.../generic_stage_target.py => base/stagebase.py} | 8 ++---
catalyst/{targets => base}/targetbase.py | 0
catalyst/targets/embedded_target.py| 12
catalyst/targets/grp_target.py | 34 +-
catalyst/targets/livecd_stage1_target.py | 21 -
catalyst/targets/livecd_stage2_target.py | 13 +
catalyst/targets/netboot2_target.py| 17 +++
catalyst/targets/netboot_target.py | 15 ++
catalyst/targets/snapshot_target.py| 4 +--
catalyst/targets/stage1_target.py | 17 ++-
catalyst/targets/stage2_target.py | 15 ++
catalyst/targets/stage3_target.py | 12
catalyst/targets/stage4_target.py | 8 ++---
catalyst/targets/tinderbox_target.py | 11 ---
17 files changed, 113 insertions(+), 75 deletions(-)
diff --git a/catalyst/base/__init__.py b/catalyst/base/__init__.py
new file mode 100644
index 000..8b13789
--- /dev/null
+++ b/catalyst/base/__init__.py
@@ -0,0 +1 @@
+
diff --git a/catalyst/targets/clearbase.py b/catalyst/base/clearbase.py
similarity index 100%
rename from catalyst/targets/clearbase.py
rename to catalyst/base/clearbase.py
diff --git a/catalyst/targets/genbase.py b/catalyst/base/genbase.py
similarity index 100%
rename from catalyst/targets/genbase.py
rename to catalyst/base/genbase.py
diff --git a/catalyst/targets/generic_stage_target.py
b/catalyst/base/stagebase.py
similarity index 99%
rename from catalyst/targets/generic_stage_target.py
rename to catalyst/base/stagebase.py
index 296eee3..bebb5dc 100644
--- a/catalyst/targets/generic_stage_target.py
+++ b/catalyst/base/stagebase.py
@@ -14,13 +14,13 @@ from catalyst.defaults import (SOURCE_MOUNT_DEFAULTS,
TARGET_MOUNT_DEFAULTS,
PORT_LOGDIR_CLEAN)
from catalyst.support import (CatalystError, msg, file_locate, normpath,
touch, cmd, warn, list_bashify, read_makeconf, read_from_clst, ismount)
-from catalyst.targets.targetbase import TargetBase
-from catalyst.targets.clearbase import ClearBase
-from catalyst.targets.genbase import GenBase
+from catalyst.base.targetbase import TargetBase
+from catalyst.base.clearbase import ClearBase
+from catalyst.base.genbase import GenBase
from catalyst.lock import LockDir
-class generic_stage_target(TargetBase, ClearBase, GenBase):
+class StageBase(TargetBase, ClearBase, GenBase):
"""
This class does all of the chroot setup, copying of files, etc. It is
the driver class for pretty much everything that Catalyst does.
diff --git a/catalyst/targets/targetbase.py b/catalyst/base/targetbase.py
similarity index 100%
rename from catalyst/targets/targetbase.py
rename to catalyst/base/targetbase.py
diff --git a/catalyst/targets/embedded_target.py
b/catalyst/targets/embedded_target.py
index 7cee7a6..528d545 100644
--- a/catalyst/targets/embedded_target.py
+++ b/catalyst/targets/embedded_target.py
@@ -10,12 +10,12 @@ ROOT=/tmp/submerge emerge --something foo bar .
"""
# NOTE: That^^ docstring has influence catalyst-spec(5) man page generation.
-import os,string,imp,types,shutil
-from catalyst.support import *
-from generic_stage_target import *
-from stat import *
-class embedded_target(generic_stage_target):
+from catalyst.support import normpath
+
+from catalyst.base.stagebase import StageBase
+
+class embedded_target(StageBase):
"""
Builder class for embedded target
"""
@@ -27,7 +27,7 @@ class embedded_target(generic_stage_target):
if "embedded/fs-type" in addlargs:
self.valid_values.append("embedded/fs-ops")
- generic_stage_target.__init__(self,spec,addlargs)
+ StageBase.__init__(self,spec,addlargs)
self.set_build_kernel_vars(addlargs)
def set_action_sequence(self):
diff --git a/catalyst/targets/grp_target.py b/catalyst/targets/grp_target.py
index 033db75..deba80a 100644
--- a/catalyst/targets/grp_target.py
+++ b/catalyst/targets/grp_target.py
@@ -3,11 +3,18 @@ Gentoo Reference Platform (GRP) target
"""
# NOTE: That^^ docstring has influence catalyst-spec(5) man page generation.
-import os,types,glob
-from catalyst.support import *
-from generic_stage_target import *
+import os
+import ty
[gentoo-commits] proj/catalyst:pending commit in: catalyst/, catalyst/targets/
commit: 11423a21603ed6ab4cdf8e1662512b9d275345bc
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 20 21:50:23 2013 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Jan 1 05:58:05 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=11423a21
[2 of 3] Update module loading for the new python structure
Rename snapshot_target to snapshot
---
catalyst/main.py | 75 --
catalyst/targets/embedded_target.py| 4 --
catalyst/targets/grp_target.py | 4 --
catalyst/targets/livecd_stage1_target.py | 4 --
catalyst/targets/livecd_stage2_target.py | 4 --
catalyst/targets/netboot2_target.py| 4 --
catalyst/targets/netboot_target.py | 4 --
.../targets/{snapshot_target.py => snapshot.py}| 6 +-
catalyst/targets/stage1_target.py | 4 --
catalyst/targets/stage2_target.py | 4 --
catalyst/targets/stage3_target.py | 4 --
catalyst/targets/stage4_target.py | 5 --
catalyst/targets/tinderbox_target.py | 4 --
13 files changed, 27 insertions(+), 99 deletions(-)
diff --git a/catalyst/main.py b/catalyst/main.py
index 15664de..1446cf9 100644
--- a/catalyst/main.py
+++ b/catalyst/main.py
@@ -16,21 +16,20 @@ import os.path
__selfpath__ = os.path.abspath(os.path.dirname(__file__))
-sys.path.append(__selfpath__ + "/modules")
from . import __version__
import catalyst.config
import catalyst.util
+from catalyst.contents import ContentsMap, CONTENTS_DEFINITIONS
+from catalyst.defaults import confdefaults, option_messages
+from catalyst.hash_utils import HashMap, HASH_DEFINITIONS
from catalyst.lock import LockInUse
from catalyst.support import CatalystError, find_binary
-from catalyst.defaults import (confdefaults, option_messages,
- required_build_targets, valid_build_targets)
-from hash_utils import HashMap, HASH_DEFINITIONS
-from contents import ContentsMap, CONTENTS_DEFINITIONS
conf_values={}
+
def usage():
print """Usage catalyst [options] [-C variable=value...] [ -s
identifier]
-a --clear-autoresume clear autoresume flags
@@ -135,59 +134,40 @@ def parse_config(myconfig):
print "Envscript support enabled."
-def import_modules():
- # import catalyst's own modules
- # (i.e. stage and the arch modules)
- targetmap={}
-
+def import_module(target):
+ """
+ import catalyst's own modules
+ (i.e. targets and the arch modules)
+ """
try:
- module_dir = __selfpath__ + "/targets/"
- for x in required_build_targets:
- try:
- fh=open(module_dir + x + ".py")
- module=imp.load_module(x, fh,"targets/" + x +
".py",
- (".py", "r", imp.PY_SOURCE))
- fh.close()
-
- except IOError:
- raise CatalystError, "Can't find " + x + ".py
plugin in " + \
- module_dir
- for x in valid_build_targets:
- try:
- fh=open(module_dir + x + ".py")
- module=imp.load_module(x, fh, "targets/" + x +
".py",
- (".py", "r", imp.PY_SOURCE))
- module.register(targetmap)
- fh.close()
-
- except IOError:
- raise CatalystError,"Can't find " + x + ".py
plugin in " + \
- module_dir
-
+ mod_name = "catalyst.targets." + target
+ module = __import__(mod_name, [],[], ["not empty"])
except ImportError as e:
- print "!!! catalyst: Python modules not found in "+\
- module_dir + "; exiting."
- print e
+ print "!!! catalyst: Python module import error: %s " % target
+ \
+ "in catalyst/targets/ ... exiting."
+ print "ERROR was: ", e
sys.exit(1)
+ return module
- return targetmap
-def build_target(addlargs, targetmap):
+def build_target(addlargs):
try:
- if addlargs["target"] not in targetmap:
- raise CatalystError,"Target \""+addlargs["target"]+"\"
not available."
-
- mytarget=targetmap[addlargs["target"]](conf_values, addlargs)
-
- mytarget.run()
+ module = import_module(addlargs["target"])
+ target = getattr(module, addlargs["target"])(conf_values,
addlargs)
+ except AttributeError:
+ raise CatalystError(
+ "Target \"%s\" not available."
[gentoo-commits] proj/catalyst:pending commit in: catalyst/base/, catalyst/
commit: f186361602b69e1c80bea5b43098d7cde7bddc15
Author: Brian Dolbec gentoo org>
AuthorDate: Tue Feb 12 04:13:13 2013 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Jan 1 05:58:06 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=f1863616
Add archdir to settings
---
catalyst/base/stagebase.py | 8 +++-
catalyst/defaults.py | 2 ++
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 96b1c19..daf8e54 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -66,17 +66,15 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.archmap = {}
self.subarchmap = {}
machinemap = {}
- arch_dir = self.settings["PythonDir"] + "/arch/"
- for x in [x[:-3] for x in os.listdir(arch_dir) if
x.endswith(".py")]:
- if x == "__init__":
- continue
+ arch_dir = self.settings["archdir"] + "/"
+ for x in [x[:-3] for x in os.listdir(arch_dir) if
x.endswith(".py") and x != "__init__.py"]:
try:
fh=open(arch_dir + x + ".py")
"""
This next line loads the plugin as a module and
assigns it to
archmap[x]
"""
- self.archmap[x]=imp.load_module(x,fh,"../arch/"
+ x + ".py",
+ self.archmap[x]=imp.load_module(x,fh, arch_dir
+ x + ".py",
(".py", "r", imp.PY_SOURCE))
"""
This next line registers all the subarches
supported in the
diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index 2839a3d..2f4f429 100644
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -21,6 +21,7 @@ valid_config_file_values.extend([ "distcc", "envscript",
verbosity = 1
confdefaults={
+ "archdir": "%(PythonDir)s/arch",
"distdir": "/usr/portage/distfiles",
"hash_function": "crc32",
"icecream": "/var/cache/icecream",
@@ -30,6 +31,7 @@ confdefaults={
"packagedir": "/usr/portage/packages",
"portdir": "/usr/portage",
"port_tmpdir": "/var/tmp/portage",
+ "PythonDir": "./catalyst",
"repo_name": "portage",
"sharedir": "/usr/lib/catalyst",
"shdir": "/usr/lib/catalyst/targets/",
[gentoo-commits] proj/catalyst:pending commit in: catalyst/, catalyst/base/
commit: e78b8bef22297f61a237aa4a7bfc4562b76064a7
Author: Brian Dolbec gentoo org>
AuthorDate: Tue Feb 12 04:06:01 2013 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Jan 1 05:58:06 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=e78b8bef
Break out more repeated (path1 + path2)'s...
Just do it once and use the temp variable.
Comment out some debug print's.
Fix options conversion for export to bash.
---
catalyst/base/stagebase.py | 43 ++-
catalyst/defaults.py | 2 ++
2 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index bebb5dc..b44a957 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -631,11 +631,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
"""
self.setup_environment()
- if os.path.exists(self.settings["sharedir"]+\
- "/targets/support/kill-chroot-pids.sh"):
- cmd("/bin/bash "+self.settings["sharedir"]+\
- "/targets/support/kill-chroot-pids.sh",\
- "kill-chroot-pids script failed.",env=self.env)
+ killcmd = normpath(self.settings["sharedir"] +
+ self.settings["shdir"] + "/support/kill-chroot-pids.sh")
+ if os.path.exists(killcmd):
+ cmd(killcmd, "kill-chroot-pids script
failed.",env=self.env)
def mount_safety_check(self):
"""
@@ -647,10 +646,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
if not os.path.exists(self.settings["chroot_path"]):
return
- print "self.mounts =", self.mounts
+ #print "self.mounts =", self.mounts
for x in self.mounts:
target = normpath(self.settings["chroot_path"] +
self.target_mounts[x])
- print "mount_safety_check() x =", x, target
+ #print "mount_safety_check() x =", x, target
if not os.path.exists(target):
continue
@@ -1020,8 +1019,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
"Couldn't umount one or more bind-mounts;
aborting for safety."
def chroot_setup(self):
- self.makeconf=read_makeconf(self.settings["chroot_path"]+\
- "/etc/portage/make.conf")
+
self.makeconf=read_makeconf(normpath(self.settings["chroot_path"]+
+ self.settings["make.conf"]))
self.override_cbuild()
self.override_chost()
self.override_cflags()
@@ -1035,8 +1034,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
else:
print "Setting up chroot..."
-
#self.makeconf=read_makeconf(self.settings["chroot_path"]+"/etc/portage/make.conf")
-
cmd("cp /etc/resolv.conf " +
self.settings["chroot_path"] + "/etc/",
"Could not copy resolv.conf into
place.",env=self.env)
@@ -1070,10 +1067,11 @@ class StageBase(TargetBase, ClearBase, GenBase):
"Could not copy
/etc/hosts",env=self.env)
""" Modify and write out make.conf (for the chroot) """
- cmd("rm -f
"+self.settings["chroot_path"]+"/etc/portage/make.conf",\
- "Could not remove
"+self.settings["chroot_path"]+\
- "/etc/portage/make.conf",env=self.env)
-
myf=open(self.settings["chroot_path"]+"/etc/portage/make.conf","w")
+ makepath = normpath(self.settings["chroot_path"] +
+ self.settings["make.conf"])
+ cmd("rm -f " + makepath,\
+ "Could not remove " + makepath, env=self.env)
+ myf=open(makepath, "w")
myf.write("# These settings were set by the catalyst
build script that automatically\n# built this stage.\n")
myf.write("# Please consult
/usr/share/portage/config/make.conf.example for a more\n# detailed example.\n")
if "CFLAGS" in self.settings:
@@ -1123,10 +1121,11 @@ class StageBase(TargetBase, ClearBase, GenBase):
myf.write('PORTDIR_OVERLAY="/usr/local/portage"\n')
myf.close()
- cmd("cp
"+self.settings["chroot_path"]+"/etc/portage/make.conf "+\
-
self.settings["chroot_path"]+"/etc/portage/make.conf.catalyst",\
- "Could not backup
/etc/portage/make.conf",env=self.env)
-
[gentoo-commits] proj/catalyst:pending commit in: catalyst/
commit: 9944ba53ababcf245d75f5d9c9efce07a4753033
Author: Brian Dolbec gentoo org>
AuthorDate: Wed Jan 23 04:57:05 2013 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Jan 1 05:58:06 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=9944ba53
reduce 2 operations into one simpler one
---
catalyst/config.py | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/catalyst/config.py b/catalyst/config.py
index 460bbd5..8b23342 100644
--- a/catalyst/config.py
+++ b/catalyst/config.py
@@ -54,11 +54,7 @@ class ParserBase:
# Skip any blank lines
if not myline: continue
- # Look for separator
- msearch = myline.find(self.key_value_separator)
-
- # If separator found assume its a new key
- if msearch != -1:
+ if self.key_value_separator in myline:
# Split on the first occurence of the separator
creating two strings in the array mobjs
mobjs = myline.split(self.key_value_separator,
1)
mobjs[1] = mobjs[1].strip().strip('"')
[gentoo-commits] proj/catalyst:pending commit in: catalyst/arch/, catalyst/base/, catalyst/, targets/stage1/, catalyst/targets/
commit: 7d8c62bdf311d774b7d60429c3a72a1fecb7166f
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 20 04:29:16 2013 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Jan 1 05:58:06 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=7d8c62bd
Pyflakes import cleanup and broken CatalystError calls.
Replace "import *" with named imports, remove unused imports.
Fix broken CatalystError usage.
Conflicts:
catalyst/base/stagebase.py
catalyst/defaults.py
catalyst/main.py
catalyst/support.py
catalyst/targets/embedded.py
catalyst/targets/generic_target.py
catalyst/targets/grp.py
catalyst/targets/livecd_stage1.py
catalyst/targets/livecd_stage2.py
catalyst/targets/netboot.py
catalyst/targets/netboot2.py
catalyst/targets/snapshot.py
catalyst/targets/stage1.py
catalyst/targets/stage2.py
catalyst/targets/stage3.py
catalyst/targets/stage4.py
catalyst/targets/tinderbox.py
---
catalyst/arch/alpha.py| 3 +-
catalyst/arch/arm.py | 2 --
catalyst/arch/hppa.py | 3 --
catalyst/arch/ia64.py | 3 --
catalyst/arch/mips.py | 3 --
catalyst/arch/powerpc.py | 5 ++--
catalyst/arch/s390.py | 3 --
catalyst/arch/sh.py | 3 --
catalyst/arch/sparc.py| 5 ++--
catalyst/arch/x86.py | 5 ++--
catalyst/base/stagebase.py| 58 +--
catalyst/config.py| 9 +++---
catalyst/contents.py | 8 +++---
catalyst/hash_utils.py| 4 +--
catalyst/lock.py | 5 ++--
catalyst/main.py | 13 ++---
catalyst/support.py | 49 +
catalyst/targets/grp.py | 5 ++--
catalyst/targets/livecd_stage1.py | 4 +--
catalyst/targets/livecd_stage2.py | 14 --
catalyst/targets/netboot.py | 15 ++
catalyst/targets/netboot2.py | 8 --
catalyst/targets/tinderbox.py | 3 +-
targets/stage1/build.py | 4 ++-
24 files changed, 118 insertions(+), 116 deletions(-)
diff --git a/catalyst/arch/alpha.py b/catalyst/arch/alpha.py
index 7248020..01b6382 100644
--- a/catalyst/arch/alpha.py
+++ b/catalyst/arch/alpha.py
@@ -1,8 +1,7 @@
-import os
from catalyst import builder
-from catalyst.support import *
+
class generic_alpha(builder.generic):
"abstract base class for all alpha builders"
diff --git a/catalyst/arch/arm.py b/catalyst/arch/arm.py
index 8f207ff..c0d322c 100644
--- a/catalyst/arch/arm.py
+++ b/catalyst/arch/arm.py
@@ -1,8 +1,6 @@
-import os
from catalyst import builder
-from catalyst.support import *
class generic_arm(builder.generic):
"Abstract base class for all arm (little endian) builders"
diff --git a/catalyst/arch/hppa.py b/catalyst/arch/hppa.py
index 3aac9b6..c5589c4 100644
--- a/catalyst/arch/hppa.py
+++ b/catalyst/arch/hppa.py
@@ -1,8 +1,5 @@
-import os
-
from catalyst import builder
-from catalyst.support import *
class generic_hppa(builder.generic):
"Abstract base class for all hppa builders"
diff --git a/catalyst/arch/ia64.py b/catalyst/arch/ia64.py
index 4003085..3f06040 100644
--- a/catalyst/arch/ia64.py
+++ b/catalyst/arch/ia64.py
@@ -1,8 +1,5 @@
-import os
-
from catalyst import builder
-from catalyst.support import *
class arch_ia64(builder.generic):
"builder class for ia64"
diff --git a/catalyst/arch/mips.py b/catalyst/arch/mips.py
index 7cce392..5297a4b 100644
--- a/catalyst/arch/mips.py
+++ b/catalyst/arch/mips.py
@@ -1,8 +1,5 @@
-import os
-
from catalyst import builder
-from catalyst.support import *
class generic_mips(builder.generic):
"Abstract base class for all mips builders [Big-endian]"
diff --git a/catalyst/arch/powerpc.py b/catalyst/arch/powerpc.py
index 6cec580..f903b38 100644
--- a/catalyst/arch/powerpc.py
+++ b/catalyst/arch/powerpc.py
@@ -2,7 +2,7 @@
import os
from catalyst import builder
-from catalyst.support import *
+from catalyst.support import CatalystError
class generic_ppc(builder.generic):
"abstract base class for all 32-bit powerpc builders"
@@ -11,7 +11,8 @@ class generic_ppc(builder.generic):
self.settings["CHOST"]="powerpc-unknown-linux-gnu"
if self.settings["buildarch"]=="ppc64":
if not os.path.exists("/bin/linux32") and not
os.path.exists("/usr/bin/linux32"):
- raise CatalystError,"required executable
linux32 not found (\"emerge setarch\" to fix.)"
+ raise CatalystError("required executable
linux32 not found "
+ "(\"emerge setarch\" to fix.)",
print_traceback=True)
self.settings["CHROOT"]="linux32 chroot"
[gentoo-commits] proj/catalyst:pending commit in: targets/tinderbox/, targets/grp/, targets/support/, targets/stage1/, ...
commit: a751343297b8f941e170f91e704a51dc3c9b4e30
Author: Brian Dolbec gentoo org>
AuthorDate: Tue Feb 12 04:09:01 2013 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Jan 1 05:58:06 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=a7513432
Make shdir a complete path to ease it's use.
Add a "shdir" setting to config.
This is to make moving the bash code around easier.
It also reduces more hardcoded paths in the bash scripts.
Migrate all target shell scripts to use the new shdir setting
---
etc/catalyst.conf | 8 ++--
targets/embedded/embedded-controller.sh | 22 ++---
targets/grp/grp-controller.sh | 6 +++---
targets/livecd-stage1/livecd-stage1-controller.sh | 4 ++--
targets/livecd-stage2/livecd-stage2-controller.sh | 22 ++---
targets/netboot/netboot-combine.sh| 6 +++---
targets/netboot/netboot-controller.sh | 24 +++
targets/netboot2/netboot2-controller.sh | 16 +++
targets/stage1/stage1-controller.sh | 8
targets/stage2/stage2-controller.sh | 6 +++---
targets/stage3/stage3-controller.sh | 6 +++---
targets/stage4/stage4-controller.sh | 22 ++---
targets/support/bootloader-setup.sh | 6 +++---
targets/support/create-iso.sh | 4 ++--
targets/support/functions.sh | 2 +-
targets/support/netboot2-final.sh | 4 ++--
targets/support/target_image_setup.sh | 4 ++--
targets/tinderbox/tinderbox-controller.sh | 6 +++---
18 files changed, 90 insertions(+), 86 deletions(-)
diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index 2d377b2..d52a5c8 100644
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -73,10 +73,14 @@ options="autoresume bindist kerncache pkgcache seedcache
snapcache"
# portdir specifies the source portage tree used by the snapshot target.
portdir="/usr/portage"
-# sharedir specifies where all of the catalyst runtime executables are. Most
-# users do not need to change this.
+# sharedir specifies where all of the catalyst runtime executables
+# and other shared lib objects are.
+# Most users do not need to change this.
sharedir="/usr/lib/catalyst"
+# shdir specifies where all of the catalyst runtime executables are.
+shdir="%(sharedir)s/targets"
+
# snapshot_cache specifies where the snapshots will be cached to if snapcache
is
# enabled in the options.
snapshot_cache="/var/tmp/catalyst/snapshot_cache"
diff --git a/targets/embedded/embedded-controller.sh
b/targets/embedded/embedded-controller.sh
index 2a0c5fe..c0b62ea 100755
--- a/targets/embedded/embedded-controller.sh
+++ b/targets/embedded/embedded-controller.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case ${1} in
enter)
@@ -11,7 +11,7 @@ case ${1} in
shift
export clst_packages="$*"
exec_in_chroot \
-
${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
@@ -21,7 +21,7 @@ case ${1} in
# export root_fs_path="${clst_chroot_path}/tmp/mergeroot"
# install -d ${clst_image_path}
-# ${clst_sharedir}/targets/embedded/embedded-fs-runscript.sh \
+# ${clst_shdir}/embedded/embedded-fs-runscript.sh \
# ${clst_embedded_fs_type} || exit 1
# imagesize=`du -sk ${clst_image_path}/root.img | cut -f1`
# echo "Created ${clst_embedded_fs_type} image at \
@@ -31,12 +31,12 @@ case ${1} in
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -47,18 +47,18 @@ case ${1} in
then
cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
;;
target_image_setup)
shift
- ${clst_sh
[gentoo-commits] proj/catalyst:pending commit in: targets/support/
commit: f11d2f64ff8af00bc4ac13e6d74f46c598334a91
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Feb 10 20:06:15 2013 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Jan 1 05:58:06 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=f11d2f64
Fix a bug that portage didn't get rebuilt with changed use flags
If clst_PGKCACHE is defined, --newuse was not being added to clst_myemergeopts,
so then portage was not being rebuilt if portage was already up to date.
Conflicts:
targets/support/chroot-functions.sh
---
targets/support/chroot-functions.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/targets/support/chroot-functions.sh
b/targets/support/chroot-functions.sh
index ee820ed..3b7f77b 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -170,14 +170,15 @@ setup_pkgmgr(){
# portage to avoid frying our /etc/portage/make.conf file. Otherwise,
we could
# just let emerge @system could merge it.
# Use --update or portage might just waste time/cycles and reinstall
the same version.
+ # Use --newuse to make sure it rebuilds with any changed use flags.
if [ -n "$1" ];then
echo "Adding USE='${USE} $1' to make.conf for portage build"
[ -e /etc/portage/make.conf ] && echo 'USE="${USE} $1"' >>
/etc/portage/make.conf
- run_merge --oneshot --update sys-apps/portage
+ run_merge --oneshot --update --newuse sys-apps/portage
sed -i '/USE="${USE} $1"/d' /etc/portage/make.conf
else
echo "Updating portage with USE='${USE}'"
- run_merge --oneshot --update sys-apps/portage
+ run_merge --oneshot --update --newuse sys-apps/portage
fi
}
[gentoo-commits] proj/catalyst:pending commit in: catalyst/, catalyst/targets/
commit: e3114e65ffdaaefe84dfe9a7678a7333280bd37f
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 20 01:28:51 2013 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Jan 1 05:58:05 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=e3114e65
Some options cleanup, unifying their use, reducing redundancy.
fix options being reset by a config file
---
catalyst/defaults.py | 22 -
catalyst/main.py | 96 ++---
catalyst/targets/generic_stage_target.py | 142 ++-
catalyst/targets/grp_target.py | 2 +-
catalyst/targets/livecd_stage1_target.py | 2 +-
catalyst/targets/livecd_stage2_target.py | 8 +-
catalyst/targets/netboot2_target.py | 10 +--
catalyst/targets/snapshot_target.py | 4 +-
catalyst/targets/stage2_target.py| 2 +-
catalyst/targets/stage4_target.py| 4 +-
10 files changed, 142 insertions(+), 150 deletions(-)
diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index b83e4f5..b36eff7 100644
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -13,10 +13,9 @@ valid_build_targets = ["stage1_target", "stage2_target",
"stage3_target",
required_config_file_values = ["storedir", "sharedir", "distdir", "portdir"]
valid_config_file_values = required_config_file_values[:]
-valid_config_file_values.extend(["PKGCACHE", "KERNCACHE", "CCACHE", "DISTCC",
- "ICECREAM", "ENVSCRIPT", "AUTORESUME", "FETCH", "CLEAR_AUTORESUME",
- "options", "DEBUG", "VERBOSE", "PURGE", "PURGEONLY", "SNAPCACHE",
- "snapshot_cache", "hash_function", "digests", "contents", "SEEDCACHE"
+valid_config_file_values.extend([ "distcc", "envscript",
+ "options", "DEBUG", "VERBOSE",
+ "snapshot_cache", "hash_function", "digests", "contents"
])
verbosity = 1
@@ -65,3 +64,18 @@ SOURCE_MOUNT_DEFAULTS = {
"shm": "shmfs",
}
+# legend: key: message
+option_messages = {
+ "autoresume": "Autoresuming support enabled.",
+ "ccache": "Compiler cache support enabled.",
+ "clear-autoresume": "Cleaning autoresume flags support enabled.",
+ #"compress": "Compression enabled.",
+ "distcc": "Distcc support enabled.",
+ "icecream": "Icecream compiler cluster support enabled.",
+ "kerncache": "Kernel cache support enabled.",
+ "pkgcache": "Package cache support enabled.",
+ "purge": "Purge support enabled.",
+ "seedcache": "Seed cache support enabled.",
+ "snapcache": "Snapshot cache support enabled.",
+ #"tarball": "Tarball creation enabled.",
+ }
diff --git a/catalyst/main.py b/catalyst/main.py
index 5748d31..81d48b5 100644
--- a/catalyst/main.py
+++ b/catalyst/main.py
@@ -22,13 +22,12 @@ from . import __version__
import catalyst.config
import catalyst.util
from catalyst.support import CatalystError, find_binary, LockInUse
-from catalyst.defaults import (required_build_targets, valid_build_targets,
- confdefaults)
+from catalyst.defaults import (confdefaults, option_messages,
+ required_build_targets, valid_build_targets)
from hash_utils import HashMap, HASH_DEFINITIONS
from contents import ContentsMap, CONTENTS_DEFINITIONS
-
conf_values={}
def usage():
@@ -106,7 +105,10 @@ def parse_config(myconfig):
for x in list(confdefaults):
if x in myconf:
print "Setting",x,"to config file value
\""+myconf[x]+"\""
- conf_values[x]=myconf[x]
+ if x == 'options':
+ conf_values[x] = set(myconf[x].split())
+ else:
+ conf_values[x]=myconf[x]
else:
print "Setting",x,"to default value
\""+confdefaults[x]+"\""
conf_values[x]=confdefaults[x]
@@ -114,74 +116,23 @@ def parse_config(myconfig):
# add our python base directory to use for loading target arch's
conf_values["PythonDir"] = __selfpath__
- # parse out the rest of the options from the config file
- if "autoresume" in string.split(conf_values["options"]):
- print "Autoresuming support enabled."
- conf_values["AUTORESUME"]="1"
-
- if "bindist" in string.split(conf_values["options"]):
- print "Binary redistribution enabled"
- conf_values["BINDIST"]="1"
- else:
- print "Bindist is not enabled in catalyst.conf"
- print "Binary redistribution of generated stages/isos may be
prohibited by law."
- print "Please see the use description for bindist on any
package you are including."
-
- if "ccache" in string.split(conf_values["options"]):
- print "Compiler cache support enabled."
- conf_values["CCACHE"]="1"
-
- if "clear-autoresume" in string.split(
[gentoo-commits] proj/catalyst:pending commit in: catalyst/
commit: fa577bb409c36c3b38a90f65cb7a665c5474d2c9 Author: Brian Dolbec gentoo org> AuthorDate: Fri Jan 25 04:00:24 2013 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 1 05:58:06 2015 + URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=fa577bb4 Extend ParserBase to do variable substitution. Also add embedded variable substitiution to default settings. Why are we not using python's built-in ConfigParser? We'll migrate it later. --- catalyst/config.py | 3 +++ catalyst/main.py | 6 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/catalyst/config.py b/catalyst/config.py index 8b23342..bf3c7c6 100644 --- a/catalyst/config.py +++ b/catalyst/config.py @@ -66,6 +66,9 @@ class ParserBase: # Start a new array using the first element of mobjs cur_array = [mobjs[0]] if mobjs[1]: + # do any variable substitiution embeded in it with + # the values already obtained + mobjs[1] = mobjs[1] % values if self.multiple_values: # split on white space creating additional array elements # subarray = white_space.split(mobjs[1]) diff --git a/catalyst/main.py b/catalyst/main.py index 1446cf9..5fa3f1b 100644 --- a/catalyst/main.py +++ b/catalyst/main.py @@ -116,7 +116,6 @@ def parse_config(myconfig): # add our python base directory to use for loading target arch's conf_values["PythonDir"] = __selfpath__ - # print out any options messages for opt in conf_values['options']: if opt in option_messages: @@ -133,6 +132,11 @@ def parse_config(myconfig): if "envscript" in myconf: print "Envscript support enabled." + # take care of any variable substitutions that may be left + for x in list(conf_values): + if isinstance(conf_values[x], str): + conf_values[x] = conf_values[x] % conf_values + def import_module(target): """
[gentoo-commits] proj/catalyst:pending commit in: catalyst/
commit: 0b3a26d733ea8e8b3fce044be1d2c872138d74d5
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 20 19:22:27 2013 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Jan 1 05:58:05 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=0b3a26d7
Some spacing, comment and indent cleanup
---
catalyst/support.py | 405 +++-
1 file changed, 213 insertions(+), 192 deletions(-)
diff --git a/catalyst/support.py b/catalyst/support.py
index feaa645..e2d64a1 100644
--- a/catalyst/support.py
+++ b/catalyst/support.py
@@ -1,12 +1,19 @@
-import sys,string,os,types,re,signal,traceback,time
-#import md5,sha
+import sys
+import string
+import os
+import types
+import re
+import signal
+import traceback
+import time
from catalyst.defaults import verbosity, valid_config_file_values
selinux_capable = False
#userpriv_capable = (os.getuid() == 0)
#fakeroot_capable = False
+
BASH_BINARY = "/bin/bash"
# set it to 0 for the soft limit, 1 for the hard limit
@@ -25,35 +32,35 @@ spawned_pids = []
def cleanup(pids,block_exceptions=True):
-"""function to go through and reap the list of pids passed to it"""
-global spawned_pids
-if type(pids) == int:
-pids = [pids]
-for x in pids:
-try:
-os.kill(x,signal.SIGTERM)
-if os.waitpid(x,os.WNOHANG)[1] == 0:
-# feisty bugger, still alive.
-os.kill(x,signal.SIGKILL)
-os.waitpid(x,0)
-
-except OSError, oe:
-if block_exceptions:
-pass
-if oe.errno not in (10,3):
-raise oe
-except SystemExit:
-raise
-except Exception:
-if block_exceptions:
-pass
-try:spawned_pids.remove(x)
-except IndexError: pass
-
-
-
-# a function to turn a string of non-printable characters into a string of
-# hex characters
+ """function to go through and reap the list of pids passed to it"""
+ global spawned_pids
+ if type(pids) == int:
+ pids = [pids]
+ for x in pids:
+ try:
+ os.kill(x,signal.SIGTERM)
+ if os.waitpid(x,os.WNOHANG)[1] == 0:
+ # feisty bugger, still alive.
+ os.kill(x,signal.SIGKILL)
+ os.waitpid(x,0)
+ except OSError, oe:
+ if block_exceptions:
+ pass
+ if oe.errno not in (10,3):
+ raise oe
+ except SystemExit:
+ raise
+ except Exception:
+ if block_exceptions:
+ pass
+ try:
+ spawned_pids.remove(x)
+ except IndexError:
+ pass
+
+
+# a function to turn a string of non-printable characters
+# into a string of hex characters
def hexify(str):
hexStr = string.hexdigits
r = ''
@@ -61,7 +68,6 @@ def hexify(str):
i = ord(ch)
r = r + hexStr[(i >> 4) & 0xF] + hexStr[i & 0xF]
return r
-# hexify()
def read_from_clst(file):
@@ -77,7 +83,6 @@ def read_from_clst(file):
myline = myline + line
myf.close()
return myline
-# read_from_clst
def list_bashify(mylist):
@@ -92,6 +97,7 @@ def list_bashify(mylist):
mypack=string.join(mypack)
return mypack
+
def list_to_string(mylist):
if type(mylist)==types.StringType:
mypack=[mylist]
@@ -104,6 +110,7 @@ def list_to_string(mylist):
mypack=string.join(mypack)
return mypack
+
class CatalystError(Exception):
def __init__(self, message):
if message:
@@ -115,84 +122,83 @@ class CatalystError(Exception):
print "!!! catalyst: "+message
print
+
def die(msg=None):
warn(msg)
sys.exit(1)
+
def warn(msg):
print "!!! catalyst: "+msg
+
def find_binary(myc):
"""look through the environmental path for an executable file named
whatever myc is"""
-# this sucks. badly.
-p=os.getenv("PATH")
-if p == None:
-return None
-for x in p.split(":"):
-#if it exists, and is executable
-if os.path.exists("%s/%s" % (x,myc)) and os.stat("%s/%s" %
(x,myc))[0] & 0x0248:
-return "%s/%s" % (x,myc)
-return None
+ # this
[gentoo-commits] proj/gentoo-keys:master commit in: /
commit: a65eef7af73a93f280684fec4ae829ad9cb1e6f6 Author: Brian Dolbec gentoo org> AuthorDate: Thu Jan 1 05:50:14 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 1 05:50:14 2015 + URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=a65eef7a Bump. Signed-off-by: Brian Dolbec gentoo.org>
[gentoo-commits] gentoo-x86 commit in games-emulation/dosbox: dosbox-9999.ebuild ChangeLog
mr_bones_15/01/01 05:10:01
Modified: dosbox-.ebuild ChangeLog
Log:
EAPI=5
(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Revision ChangesPath
1.7 games-emulation/dosbox/dosbox-.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/dosbox/dosbox-.ebuild?rev=1.7&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/dosbox/dosbox-.ebuild?rev=1.7&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/dosbox/dosbox-.ebuild?r1=1.6&r2=1.7
Index: dosbox-.ebuild
===
RCS file: /var/cvsroot/gentoo-x86/games-emulation/dosbox/dosbox-.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dosbox-.ebuild 2 Apr 2013 15:35:59 - 1.6
+++ dosbox-.ebuild 1 Jan 2015 05:10:01 - 1.7
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox/dosbox-.ebuild,v
1.6 2013/04/02 15:35:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox/dosbox-.ebuild,v
1.7 2015/01/01 05:10:01 mr_bones_ Exp $
-EAPI=2
+EAPI=5
ESVN_REPO_URI="https://dosbox.svn.sourceforge.net/svnroot/dosbox/dosbox/trunk";
inherit autotools eutils subversion games
@@ -21,6 +21,7 @@
media-libs/libsdl[joystick,video,X]
media-libs/sdl-net
media-libs/sdl-sound"
+RDEPEND=${DEPEND}
S=${WORKDIR}/${PN}
@@ -35,7 +36,6 @@
src_configure() {
egamesconf \
- --disable-dependency-tracking \
$(use_enable alsa alsa-midi) \
$(use_enable !hardened dynamic-core) \
$(use_enable !hardened dynamic-x86) \
@@ -44,8 +44,7 @@
}
src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog NEWS README THANKS
+ default
make_desktop_entry dosbox DOSBox /usr/share/pixmaps/dosbox.ico
doicon src/dosbox.ico
prepgamesdirs
1.63 games-emulation/dosbox/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/dosbox/ChangeLog?rev=1.63&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/dosbox/ChangeLog?rev=1.63&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/dosbox/ChangeLog?r1=1.62&r2=1.63
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/games-emulation/dosbox/ChangeLog,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- ChangeLog 2 Apr 2013 15:35:59 - 1.62
+++ ChangeLog 1 Jan 2015 05:10:01 - 1.63
@@ -1,6 +1,9 @@
# ChangeLog for games-emulation/dosbox
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox/ChangeLog,v 1.62
2013/04/02 15:35:59 mr_bones_ Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox/ChangeLog,v 1.63
2015/01/01 05:10:01 mr_bones_ Exp $
+
+ 01 Jan 2015; Michael Sterrett dosbox-.ebuild:
+ EAPI=5
02 Apr 2013; Michael Sterrett dosbox-0.74.ebuild,
dosbox-.ebuild:
[gentoo-commits] proj/gentoo-keys:master commit in: /
commit: 90355479c957f3a0c18a77bcca0f944026c36fdb Author: Robin H. Johnson gentoo org> AuthorDate: Thu Jan 1 04:57:15 2015 + Commit: Robin H. Johnson gentoo org> CommitDate: Thu Jan 1 04:57:15 2015 + URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=90355479 Bump. Signed-off-by: Robin H. Johnson gentoo.org>
[gentoo-commits] proj/gentoo-keys:master commit in: /
commit: de27f5b10a599816f43d2d739d9fe087a447848e Author: Robin H. Johnson gentoo org> AuthorDate: Thu Jan 1 04:52:24 2015 + Commit: Robin H. Johnson gentoo org> CommitDate: Thu Jan 1 04:52:24 2015 + URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=de27f5b1 Bump. Signed-off-by: Robin H. Johnson gentoo.org>
[gentoo-commits] proj/gentoo-keys:master commit in: /
commit: 724cdaca1b74c4df9af15d6528dd86f81d1e718b Author: Robin H. Johnson gentoo org> AuthorDate: Thu Jan 1 04:51:43 2015 + Commit: Robin H. Johnson gentoo org> CommitDate: Thu Jan 1 04:51:43 2015 + URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=724cdaca Bump. Signed-off-by: Robin H. Johnson gentoo.org>
[gentoo-commits] proj/gentoo-keys:master commit in: /
commit: bd657b51db206db094669e60bf81290f0b7794c3 Author: Robin H. Johnson gentoo org> AuthorDate: Thu Jan 1 04:50:03 2015 + Commit: Robin H. Johnson gentoo org> CommitDate: Thu Jan 1 04:50:03 2015 + URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=bd657b51 Bump. Signed-off-by: Robin H. Johnson gentoo.org>
[gentoo-commits] proj/gentoo-keys:master commit in: /
commit: fbaccabb2cd56440d04aeccc14785a618f78ac3c Author: Robin H. Johnson gentoo org> AuthorDate: Thu Jan 1 04:42:55 2015 + Commit: Robin H. Johnson gentoo org> CommitDate: Thu Jan 1 04:42:55 2015 + URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=fbaccabb Bump. Signed-off-by: Robin H. Johnson gentoo.org>
[gentoo-commits] gentoo-x86 commit in dev-python/cython: cython-0.21.2.ebuild ChangeLog
floppym 15/01/01 04:41:31
Modified: cython-0.21.2.ebuild ChangeLog
Log:
Drop unnecessary python_gen_cond_dep call.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
0BBEEA1FEA4843A4)
Revision ChangesPath
1.2 dev-python/cython/cython-0.21.2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cython/cython-0.21.2.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cython/cython-0.21.2.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cython/cython-0.21.2.ebuild?r1=1.1&r2=1.2
Index: cython-0.21.2.ebuild
===
RCS file: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.21.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cython-0.21.2.ebuild1 Jan 2015 01:25:30 - 1.1
+++ cython-0.21.2.ebuild1 Jan 2015 04:41:31 - 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.21.2.ebuild,v
1.1 2015/01/01 01:25:30 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.21.2.ebuild,v
1.2 2015/01/01 04:41:31 floppym Exp $
EAPI=5
@@ -26,7 +26,7 @@
DEPEND="${RDEPEND}
>=dev-python/setuptools-9.1[${PYTHON_USEDEP}]
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? ( $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]'
'python*') )"
+ test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
S="${WORKDIR}/${MY_PN}-${PV%_*}"
1.141dev-python/cython/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cython/ChangeLog?rev=1.141&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cython/ChangeLog?rev=1.141&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cython/ChangeLog?r1=1.140&r2=1.141
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/dev-python/cython/ChangeLog,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- ChangeLog 1 Jan 2015 01:25:30 - 1.140
+++ ChangeLog 1 Jan 2015 04:41:31 - 1.141
@@ -1,6 +1,9 @@
# ChangeLog for dev-python/cython
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/ChangeLog,v 1.140
2015/01/01 01:25:30 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/ChangeLog,v 1.141
2015/01/01 04:41:31 floppym Exp $
+
+ 01 Jan 2015; Mike Gilbert cython-0.21.2.ebuild:
+ Drop unnecessary python_gen_cond_dep call.
*cython-0.21.2 (01 Jan 2015)
[gentoo-commits] gentoo-x86 commit in dev-haskell/hspec-expectations: hspec-expectations-0.6.1.1.ebuild ChangeLog
gienah 15/01/01 03:43:18
Modified: ChangeLog
Added:hspec-expectations-0.6.1.1.ebuild
Log:
Bump hspec-expectations to 0.6.1.1
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
618E971F)
Revision ChangesPath
1.10 dev-haskell/hspec-expectations/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/hspec-expectations/ChangeLog?rev=1.10&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/hspec-expectations/ChangeLog?rev=1.10&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/hspec-expectations/ChangeLog?r1=1.9&r2=1.10
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/hspec-expectations/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ChangeLog 14 Dec 2014 05:20:57 - 1.9
+++ ChangeLog 1 Jan 2015 03:43:18 - 1.10
@@ -1,6 +1,12 @@
# ChangeLog for dev-haskell/hspec-expectations
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hspec-expectations/ChangeLog,v
1.9 2014/12/14 05:20:57 gienah Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hspec-expectations/ChangeLog,v
1.10 2015/01/01 03:43:18 gienah Exp $
+
+*hspec-expectations-0.6.1.1 (01 Jan 2015)
+
+ 01 Jan 2015; Mark Wright
+ +hspec-expectations-0.6.1.1.ebuild:
+ Bump hspec-expectations to 0.6.1.1
*hspec-expectations-0.6.1 (14 Dec 2014)
1.1
dev-haskell/hspec-expectations/hspec-expectations-0.6.1.1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/hspec-expectations/hspec-expectations-0.6.1.1.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/hspec-expectations/hspec-expectations-0.6.1.1.ebuild?rev=1.1&content-type=text/plain
Index: hspec-expectations-0.6.1.1.ebuild
===
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header:
/var/cvsroot/gentoo-x86/dev-haskell/hspec-expectations/hspec-expectations-0.6.1.1.ebuild,v
1.1 2015/01/01 03:43:18 gienah Exp $
EAPI=5
# ebuild generated by hackport 0.4.4.
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
DESCRIPTION="Catchy combinators for HUnit"
HOMEPAGE="https://github.com/sol/hspec-expectations#readme";
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="dev-haskell/hunit:=[profile?]
>=dev-lang/ghc-7.4.1:=
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.8
test? ( >=dev-haskell/hspec-2
[gentoo-commits] gentoo-x86 commit in dev-util/boost-build: boost-build-1.53.0.ebuild boost-build-1.56.0.ebuild boost-build-1.55.0-r1.ebuild boost-build-1.55.0.ebuild boost-build-1.54.0.ebuild boost-b
patrick 15/01/01 03:30:46 Modified: boost-build-1.53.0.ebuild boost-build-1.56.0.ebuild boost-build-1.55.0-r1.ebuild boost-build-1.55.0.ebuild boost-build-1.54.0.ebuild boost-build-1.52.0-r1.ebuild ChangeLog Log: Disable test phase as it hasn't worked in over 2 years #442576 etc. (Portage version: 2.2.15/cvs/Linux x86_64, unsigned Manifest commit) Revision ChangesPath 1.4 dev-util/boost-build/boost-build-1.53.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/boost-build/boost-build-1.53.0.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/boost-build/boost-build-1.53.0.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/boost-build/boost-build-1.53.0.ebuild?r1=1.3&r2=1.4 Index: boost-build-1.53.0.ebuild === RCS file: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.53.0.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- boost-build-1.53.0.ebuild 10 Aug 2014 21:25:43 - 1.3 +++ boost-build-1.53.0.ebuild 1 Jan 2015 03:30:46 - 1.4 @@ -1,10 +1,12 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.53.0.ebuild,v 1.3 2014/08/10 21:25:43 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.53.0.ebuild,v 1.4 2015/01/01 03:30:46 patrick Exp $ EAPI="5" PYTHON_DEPEND="python? 2" +RESTRICT="test" + inherit eutils flag-o-matic multilib python toolchain-funcs versionator MY_PV=$(replace_all_version_separators _) 1.4 dev-util/boost-build/boost-build-1.56.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/boost-build/boost-build-1.56.0.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/boost-build/boost-build-1.56.0.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/boost-build/boost-build-1.56.0.ebuild?r1=1.3&r2=1.4 Index: boost-build-1.56.0.ebuild === RCS file: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.56.0.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- boost-build-1.56.0.ebuild 16 Nov 2014 16:01:22 - 1.3 +++ boost-build-1.56.0.ebuild 1 Jan 2015 03:30:46 - 1.4 @@ -1,9 +1,11 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.56.0.ebuild,v 1.3 2014/11/16 16:01:22 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.56.0.ebuild,v 1.4 2015/01/01 03:30:46 patrick Exp $ EAPI="5" +RESTRICT="test" + PYTHON_COMPAT=( python2_7 ) inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs versionator 1.3 dev-util/boost-build/boost-build-1.55.0-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/boost-build/boost-build-1.55.0-r1.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/boost-build/boost-build-1.55.0-r1.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/boost-build/boost-build-1.55.0-r1.ebuild?r1=1.2&r2=1.3 Index: boost-build-1.55.0-r1.ebuild === RCS file: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.55.0-r1.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- boost-build-1.55.0-r1.ebuild16 Nov 2014 16:01:22 - 1.2 +++ boost-build-1.55.0-r1.ebuild1 Jan 2015 03:30:46 - 1.3 @@ -1,9 +1,11 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.55.0-r1.ebuild,v 1.2 2014/11/16 16:01:22 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.55.0-r1.ebuild,v 1.3 2015/01/01 03:30:46 patrick Exp $ EAPI="5" +RESTRICT="test" + PYTHON_COMPAT=( python2_7 ) inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs versionator 1.8 dev-util/boost-build/boost-build-1.55.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/boost-build/boost-build-1.55.0.ebuild?rev=1.8&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/
[gentoo-commits] gentoo-x86 commit in /: header.txt
ulm 15/01/01 02:44:01 Modified: header.txt Log: Happy New Year 2015! Revision ChangesPath 1.21 header.txt file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/header.txt?rev=1.21&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/header.txt?rev=1.21&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/header.txt?r1=1.20&r2=1.21 Index: header.txt === RCS file: /var/cvsroot/gentoo-x86/header.txt,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- header.txt 1 Jan 2014 00:14:42 - 1.20 +++ header.txt 1 Jan 2015 02:44:01 - 1.21 @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $
[gentoo-commits] proj/api:master commit in: files/gentoo-keys/specs/
commit: e53bdba3bcf9742387f514bbf9c3c07a175ad65c
Author: Brian Dolbec gentoo org>
AuthorDate: Thu Jan 1 02:31:29 2015 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Jan 1 02:32:18 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/api.git;a=commit;h=e53bdba3
Rename glep63.spec to glep-63-recommended.spec
---
.../specs/{glep63.spec => glep-63-recommended.spec} | 0
.../specs/{glep63.spec.sig => glep-63-recommended.spec.sig} | Bin
2 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/files/gentoo-keys/specs/glep63.spec
b/files/gentoo-keys/specs/glep-63-recommended.spec
similarity index 100%
rename from files/gentoo-keys/specs/glep63.spec
rename to files/gentoo-keys/specs/glep-63-recommended.spec
diff --git a/files/gentoo-keys/specs/glep63.spec.sig
b/files/gentoo-keys/specs/glep-63-recommended.spec.sig
similarity index 100%
rename from files/gentoo-keys/specs/glep63.spec.sig
rename to files/gentoo-keys/specs/glep-63-recommended.spec.sig
[gentoo-commits] proj/api:master commit in: files/gentoo-keys/specs/
commit: c842258a2875d8f328f45138cf33095655e458d1
Author: Brian Dolbec gentoo org>
AuthorDate: Thu Jan 1 02:33:47 2015 +
Commit: Brian Dolbec gentoo org>
CommitDate: Thu Jan 1 02:33:47 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/api.git;a=commit;h=c842258a
gentoo-keys: Add new glep-63.spec with minimum settings
---
files/gentoo-keys/specs/glep-63.spec | 13 +
files/gentoo-keys/specs/glep-63.spec.sig | Bin 0 -> 639 bytes
2 files changed, 13 insertions(+)
diff --git a/files/gentoo-keys/specs/glep-63.spec
b/files/gentoo-keys/specs/glep-63.spec
new file mode 100644
index 000..7c2e554
--- /dev/null
+++ b/files/gentoo-keys/specs/glep-63.spec
@@ -0,0 +1,13 @@
+
+Key-Type: RSA
+Key-Length: 2048
+Expire-Date: 60m
+Key-Usage: ,
+Subkey-Type: RSA
+Subkey-Length: 2048
+Subkey-Usage: sign
+Name-Real: {0}
+Name-Email: {1}
+%ask-passphrase
+
+
diff --git a/files/gentoo-keys/specs/glep-63.spec.sig
b/files/gentoo-keys/specs/glep-63.spec.sig
new file mode 100644
index 000..19e2944
Binary files /dev/null and b/files/gentoo-keys/specs/glep-63.spec.sig differ
[gentoo-commits] gentoo-x86 commit in dev-haskell/parallel: parallel-3.2.0.6.ebuild ChangeLog
gienah 15/01/01 02:27:45
Modified: ChangeLog
Added:parallel-3.2.0.6.ebuild
Log:
Bump parallel to 3.2.0.6
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
618E971F)
Revision ChangesPath
1.23 dev-haskell/parallel/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/parallel/ChangeLog?rev=1.23&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/parallel/ChangeLog?rev=1.23&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/parallel/ChangeLog?r1=1.22&r2=1.23
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/parallel/ChangeLog,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ChangeLog 14 Dec 2014 05:27:54 - 1.22
+++ ChangeLog 1 Jan 2015 02:27:45 - 1.23
@@ -1,6 +1,11 @@
# ChangeLog for dev-haskell/parallel
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/parallel/ChangeLog,v 1.22
2014/12/14 05:27:54 gienah Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/parallel/ChangeLog,v 1.23
2015/01/01 02:27:45 gienah Exp $
+
+*parallel-3.2.0.6 (01 Jan 2015)
+
+ 01 Jan 2015; Mark Wright +parallel-3.2.0.6.ebuild:
+ Bump parallel to 3.2.0.6
*parallel-3.2.0.5 (14 Dec 2014)
1.1 dev-haskell/parallel/parallel-3.2.0.6.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/parallel/parallel-3.2.0.6.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/parallel/parallel-3.2.0.6.ebuild?rev=1.1&content-type=text/plain
Index: parallel-3.2.0.6.ebuild
===
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header:
/var/cvsroot/gentoo-x86/dev-haskell/parallel/parallel-3.2.0.6.ebuild,v 1.1
2015/01/01 02:27:45 gienah Exp $
EAPI=5
# ebuild generated by hackport 0.4.4.
CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
DESCRIPTION="Parallel programming library"
HOMEPAGE="http://hackage.haskell.org/package/parallel";
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="3/${PV}"
KEYWORDS="~amd64 ~sparc ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.10
"
[gentoo-commits] gentoo-x86 commit in dev-haskell/contravariant: metadata.xml contravariant-1.2.0.1.ebuild ChangeLog
gienah 15/01/01 02:23:47
Modified: metadata.xml ChangeLog
Added:contravariant-1.2.0.1.ebuild
Log:
Bump contravariant to 1.2.0.1
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
618E971F)
Revision ChangesPath
1.3 dev-haskell/contravariant/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/contravariant/metadata.xml?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/contravariant/metadata.xml?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/contravariant/metadata.xml?r1=1.2&r2=1.3
Index: metadata.xml
===
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/contravariant/metadata.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- metadata.xml25 Jul 2014 08:59:15 - 1.2
+++ metadata.xml1 Jan 2015 02:23:47 - 1.3
@@ -5,4 +5,10 @@
Haskell 98 contravariant functors
+
+ You can disable the use of the `tagged` package
+ on older versons of GHC using `-f-tagged`. Disabling this is an
+ unsupported configuration, but it may be useful for accelerating
+ builds in sandboxes for expert users.
+
1.5 dev-haskell/contravariant/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/contravariant/ChangeLog?rev=1.5&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/contravariant/ChangeLog?rev=1.5&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/contravariant/ChangeLog?r1=1.4&r2=1.5
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/contravariant/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ChangeLog 14 Dec 2014 08:41:54 - 1.4
+++ ChangeLog 1 Jan 2015 02:23:47 - 1.5
@@ -1,6 +1,12 @@
# ChangeLog for dev-haskell/contravariant
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/contravariant/ChangeLog,v 1.4
2014/12/14 08:41:54 gienah Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/contravariant/ChangeLog,v 1.5
2015/01/01 02:23:47 gienah Exp $
+
+*contravariant-1.2.0.1 (01 Jan 2015)
+
+ 01 Jan 2015; Mark Wright +contravariant-1.2.0.1.ebuild,
+ metadata.xml:
+ Bump contravariant to 1.2.0.1
*contravariant-1.2 (14 Dec 2014)
1.1 dev-haskell/contravariant/contravariant-1.2.0.1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/contravariant/contravariant-1.2.0.1.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/contravariant/contravariant-1.2.0.1.ebuild?rev=1.1&content-type=text/plain
Index: contravariant-1.2.0.1.ebuild
===
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header:
/var/cvsroot/gentoo-x86/dev-haskell/contravariant/contravariant-1.2.0.1.ebuild,v
1.1 2015/01/01 02:23:47 gienah Exp $
EAPI=5
# ebuild generated by hackport 0.4.4.
CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
DESCRIPTION="Contravariant functors"
HOMEPAGE="http://github.com/ekmett/contravariant/";
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
IUSE="+tagged"
RDEPEND=">=dev-haskell/semigroups-0.15.2:=[profile?]
=dev-haskell/transformers-0.2:=[profile?]
=dev-haskell/transformers-compat-0.3:=[profile?]
=dev-haskell/void-0.6:=[profile?] =dev-lang/ghc-7.4.1:=
tagged? ( >=dev-haskell/tagged-0.4.4:=[profile?]
[gentoo-commits] gentoo-x86 commit in games-simulation/qct: qct-0.7-r1.ebuild ChangeLog
mr_bones_15/01/01 01:49:51
Modified: ChangeLog
Added:qct-0.7-r1.ebuild
Log:
convert to python-single-r1; EAPI=5
(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Revision ChangesPath
1.9 games-simulation/qct/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/qct/ChangeLog?rev=1.9&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/qct/ChangeLog?rev=1.9&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/qct/ChangeLog?r1=1.8&r2=1.9
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/games-simulation/qct/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ChangeLog 8 Apr 2010 08:48:11 - 1.8
+++ ChangeLog 1 Jan 2015 01:49:51 - 1.9
@@ -1,6 +1,11 @@
# ChangeLog for games-simulation/qct
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/qct/ChangeLog,v 1.8
2010/04/08 08:48:11 tupone Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/qct/ChangeLog,v 1.9
2015/01/01 01:49:51 mr_bones_ Exp $
+
+*qct-0.7-r1 (01 Jan 2015)
+
+ 01 Jan 2015; Michael Sterrett +qct-0.7-r1.ebuild:
+ convert to python-single-r1; EAPI=5
08 Apr 2010; Tupone Alfredo qct-0.7.ebuild:
Force use of python2 . Bug #312281 by arfre...@gentoo.org
@@ -26,4 +31,3 @@
01 Apr 2004; Michael Sterrett metadata.xml,
qct-0.7.ebuild:
initial commit; ebuild submitted by Alexandru Toma via bug #46472
-
1.1 games-simulation/qct/qct-0.7-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/qct/qct-0.7-r1.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/qct/qct-0.7-r1.ebuild?rev=1.1&content-type=text/plain
Index: qct-0.7-r1.ebuild
===
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/games-simulation/qct/qct-0.7-r1.ebuild,v 1.1
2015/01/01 01:49:51 mr_bones_ Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
inherit eutils python-single-r1 games
DESCRIPTION="Quiet Console Town puts you in the place of the mayor of a budding
new console RPG city"
HOMEPAGE="http://packages.gentoo.org/package/games-simulation/qct";
SRC_URI="http://www.sourcefiles.org/Games/Role_Play/${P}.tar.gz";
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
DEPEND=">=dev-python/pygame-1.5.5[${PYTHON_USEDEP}]"
RDEPEND=${RDEPEND}
REQUIRED_USE=${PYTHON_REQUIRED_USE}
S=${WORKDIR}/${PN}
src_prepare() {
epatch "${FILESDIR}"/${P}-constant.patch
python_fix_shebang .
}
src_install() {
# Ug. Someone fix this to install in $(games_get_libdir)/${PN} instead
local destdir="${GAMES_DATADIR}/${PN}"
insinto "${destdir}"
exeinto "${destdir}"
dodoc README
doins *.py *.png
doexe qct.py
python_optimize "${D}${GAMES_DATADIR}/${PN}"
games_make_wrapper qct "./qct.py" "${destdir}"
prepgamesdirs
}
pkg_setup() {
python-single-r1_pkg_setup
games_pkg_setup
}
[gentoo-commits] gentoo-x86 commit in dev-python/cython: cython-0.21.1.ebuild cython-0.21.2.ebuild ChangeLog
idella4 15/01/01 01:25:30
Modified: cython-0.21.1.ebuild ChangeLog
Added:cython-0.21.2.ebuild
Log:
bump; drop pypy support due to failing testsuites, set border to version of
setuptools, found to be required on testing, tidy
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
0xB8072B0D)
Revision ChangesPath
1.4 dev-python/cython/cython-0.21.1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cython/cython-0.21.1.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cython/cython-0.21.1.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cython/cython-0.21.1.ebuild?r1=1.3&r2=1.4
Index: cython-0.21.1.ebuild
===
RCS file: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.21.1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cython-0.21.1.ebuild23 Nov 2014 17:32:30 - 1.3
+++ cython-0.21.1.ebuild1 Jan 2015 01:25:30 - 1.4
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.21.1.ebuild,v
1.3 2014/11/23 17:32:30 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.21.1.ebuild,v
1.4 2015/01/01 01:25:30 idella4 Exp $
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
inherit distutils-r1 flag-o-matic toolchain-funcs
1.140dev-python/cython/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cython/ChangeLog?rev=1.140&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cython/ChangeLog?rev=1.140&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cython/ChangeLog?r1=1.139&r2=1.140
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/dev-python/cython/ChangeLog,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- ChangeLog 1 Dec 2014 09:44:54 - 1.139
+++ ChangeLog 1 Jan 2015 01:25:30 - 1.140
@@ -1,6 +1,13 @@
# ChangeLog for dev-python/cython
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/ChangeLog,v 1.139
2014/12/01 09:44:54 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/ChangeLog,v 1.140
2015/01/01 01:25:30 idella4 Exp $
+
+*cython-0.21.2 (01 Jan 2015)
+
+ 01 Jan 2015; Ian Delaney +cython-0.21.2.ebuild,
+ cython-0.21.1.ebuild:
+ bump; drop pypy support due to failing testsuites, set border to version of
+ setuptools, found to be required on testing, tidy
01 Dec 2014; Agostino Sarubbo cython-0.21.ebuild:
Stable for sparc, wrt bug #524416
1.1 dev-python/cython/cython-0.21.2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cython/cython-0.21.2.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cython/cython-0.21.2.ebuild?rev=1.1&content-type=text/plain
Index: cython-0.21.2.ebuild
===
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.21.2.ebuild,v 1.1
2015/01/01 01:25:30 idella4 Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
inherit distutils-r1 flag-o-matic toolchain-funcs
MY_PN="Cython"
MY_P="${MY_PN}-${PV/_/}"
DESCRIPTION="A Python to C compiler"
HOMEPAGE="http://www.cython.org/ http://pypi.python.org/pypi/Cython";
SRC_URI="http://www.cython.org/release/${MY_P}.tar.gz";
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="doc examples test"
RDEPEND=""
# On testing, setuptools invokes an error in running the testsuite cited in a
number of recent bugs
# spanning several packages. This bug has been fixed in the recent release of
version 9.1
DEPEND="${RDEPEND}
>=dev-python/setuptools-9.1[${PYTHON_USEDEP}]
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
test? ( $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]'
'python*') )"
S="${WORKDIR}/${MY_PN}-${PV%_*}"
python_compile() {
if ! python_is_python3; then
local CFLAGS="${CFLAGS}"
local CXXFLAGS="${CXXFLAGS}"
append-flags -fno
[gentoo-commits] gentoo-x86 commit in /: skel.ebuild skel.ChangeLog
jcallen 15/01/01 00:16:21 Modified: skel.ebuild skel.ChangeLog Log: Happy New Year 2015! Revision ChangesPath 1.72 skel.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/skel.ebuild?rev=1.72&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/skel.ebuild?rev=1.72&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/skel.ebuild?r1=1.71&r2=1.72 Index: skel.ebuild === RCS file: /var/cvsroot/gentoo-x86/skel.ebuild,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- skel.ebuild 30 Aug 2014 09:51:19 - 1.71 +++ skel.ebuild 1 Jan 2015 00:16:21 - 1.72 @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ 1.30 skel.ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/skel.ChangeLog?rev=1.30&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/skel.ChangeLog?rev=1.30&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/skel.ChangeLog?r1=1.29&r2=1.30 Index: skel.ChangeLog === RCS file: /var/cvsroot/gentoo-x86/skel.ChangeLog,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- skel.ChangeLog 18 Aug 2014 18:40:32 - 1.29 +++ skel.ChangeLog 1 Jan 2015 00:16:21 - 1.30 @@ -1,5 +1,5 @@ # ChangeLog for / -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ *-- (DD MMM )
[gentoo-commits] gentoo-x86 commit in games-sports/ski: ski-6.8.ebuild ChangeLog
mr_bones_15/01/01 00:09:33
Modified: ski-6.8.ebuild ChangeLog
Log:
punt 2_6
(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Revision ChangesPath
1.2 games-sports/ski/ski-6.8.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-sports/ski/ski-6.8.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-sports/ski/ski-6.8.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-sports/ski/ski-6.8.ebuild?r1=1.1&r2=1.2
Index: ski-6.8.ebuild
===
RCS file: /var/cvsroot/gentoo-x86/games-sports/ski/ski-6.8.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ski-6.8.ebuild 22 May 2014 06:36:54 - 1.1
+++ ski-6.8.ebuild 1 Jan 2015 00:09:33 - 1.2
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/ski/ski-6.8.ebuild,v 1.1
2014/05/22 06:36:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/ski/ski-6.8.ebuild,v 1.2
2015/01/01 00:09:33 mr_bones_ Exp $
EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
inherit python-single-r1 games
DESCRIPTION="A simple text-mode skiing game"
1.17 games-sports/ski/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-sports/ski/ChangeLog?rev=1.17&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-sports/ski/ChangeLog?rev=1.17&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-sports/ski/ChangeLog?r1=1.16&r2=1.17
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/games-sports/ski/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ChangeLog 22 May 2014 06:36:54 - 1.16
+++ ChangeLog 1 Jan 2015 00:09:33 - 1.17
@@ -1,6 +1,9 @@
# ChangeLog for games-sports/ski
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/ski/ChangeLog,v 1.16
2014/05/22 06:36:54 mr_bones_ Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-sports/ski/ChangeLog,v 1.17
2015/01/01 00:09:33 mr_bones_ Exp $
+
+ 01 Jan 2015; Michael Sterrett ski-6.8.ebuild:
+ punt 2_6
*ski-6.8 (22 May 2014)
[gentoo-commits] gentoo-x86 commit in games-action/accelerator3d: accelerator3d-0.1.1-r2.ebuild ChangeLog
mr_bones_15/01/01 00:03:21 Modified: accelerator3d-0.1.1-r2.ebuild ChangeLog Log: punt 2_6 (Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit) Revision ChangesPath 1.5 games-action/accelerator3d/accelerator3d-0.1.1-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/accelerator3d/accelerator3d-0.1.1-r2.ebuild?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/accelerator3d/accelerator3d-0.1.1-r2.ebuild?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/accelerator3d/accelerator3d-0.1.1-r2.ebuild?r1=1.4&r2=1.5 Index: accelerator3d-0.1.1-r2.ebuild === RCS file: /var/cvsroot/gentoo-x86/games-action/accelerator3d/accelerator3d-0.1.1-r2.ebuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- accelerator3d-0.1.1-r2.ebuild 1 Jan 2015 00:00:03 - 1.4 +++ accelerator3d-0.1.1-r2.ebuild 1 Jan 2015 00:03:21 - 1.5 @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/accelerator3d/accelerator3d-0.1.1-r2.ebuild,v 1.4 2015/01/01 00:00:03 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/accelerator3d/accelerator3d-0.1.1-r2.ebuild,v 1.5 2015/01/01 00:03:21 mr_bones_ Exp $ EAPI=5 -PYTHON_COMPAT=( python2_6 python2_7 ) +PYTHON_COMPAT=( python2_7 ) inherit eutils python-r1 games DESCRIPTION="Fast-paced, 3D, first-person shoot/dodge-'em-up, in the vain of Tempest or n2o" 1.13 games-action/accelerator3d/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/accelerator3d/ChangeLog?rev=1.13&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/accelerator3d/ChangeLog?rev=1.13&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/accelerator3d/ChangeLog?r1=1.12&r2=1.13 Index: ChangeLog === RCS file: /var/cvsroot/gentoo-x86/games-action/accelerator3d/ChangeLog,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ChangeLog 1 Jan 2015 00:00:03 - 1.12 +++ ChangeLog 1 Jan 2015 00:03:21 - 1.13 @@ -1,6 +1,10 @@ # ChangeLog for games-action/accelerator3d -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/accelerator3d/ChangeLog,v 1.12 2015/01/01 00:00:03 mr_bones_ Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-action/accelerator3d/ChangeLog,v 1.13 2015/01/01 00:03:21 mr_bones_ Exp $ + + 01 Jan 2015; Michael Sterrett + accelerator3d-0.1.1-r2.ebuild: + punt 2_6 31 Dec 2014; Michael Sterrett accelerator3d-0.1.1-r2.ebuild:
[gentoo-commits] gentoo-x86 commit in games-action/accelerator3d: accelerator3d-0.1.1-r2.ebuild ChangeLog
mr_bones_15/01/01 00:00:03
Modified: accelerator3d-0.1.1-r2.ebuild ChangeLog
Log:
tidy
(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Revision ChangesPath
1.4 games-action/accelerator3d/accelerator3d-0.1.1-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/accelerator3d/accelerator3d-0.1.1-r2.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/accelerator3d/accelerator3d-0.1.1-r2.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/accelerator3d/accelerator3d-0.1.1-r2.ebuild?r1=1.3&r2=1.4
Index: accelerator3d-0.1.1-r2.ebuild
===
RCS file:
/var/cvsroot/gentoo-x86/games-action/accelerator3d/accelerator3d-0.1.1-r2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- accelerator3d-0.1.1-r2.ebuild 1 Dec 2013 17:32:45 - 1.3
+++ accelerator3d-0.1.1-r2.ebuild 1 Jan 2015 00:00:03 - 1.4
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/games-action/accelerator3d/accelerator3d-0.1.1-r2.ebuild,v
1.3 2013/12/01 17:32:45 hasufell Exp $
+# $Header:
/var/cvsroot/gentoo-x86/games-action/accelerator3d/accelerator3d-0.1.1-r2.ebuild,v
1.4 2015/01/01 00:00:03 mr_bones_ Exp $
EAPI=5
PYTHON_COMPAT=( python2_6 python2_7 )
@@ -37,7 +37,7 @@
python_scriptinto "${GAMES_BINDIR}"
python_foreach_impl python_newscript accelerator.py accelerator
insinto "${GAMES_DATADIR}"/${PN}
- doins gfx/* snd/* || die "doins failed"
+ doins gfx/* snd/*
dodoc CHANGELOG README
make_desktop_entry accelerator
1.12 games-action/accelerator3d/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/accelerator3d/ChangeLog?rev=1.12&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/accelerator3d/ChangeLog?rev=1.12&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/accelerator3d/ChangeLog?r1=1.11&r2=1.12
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/games-action/accelerator3d/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ChangeLog 1 Dec 2013 17:32:45 - 1.11
+++ ChangeLog 1 Jan 2015 00:00:03 - 1.12
@@ -1,6 +1,10 @@
# ChangeLog for games-action/accelerator3d
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/accelerator3d/ChangeLog,v 1.11
2013/12/01 17:32:45 hasufell Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/accelerator3d/ChangeLog,v 1.12
2015/01/01 00:00:03 mr_bones_ Exp $
+
+ 31 Dec 2014; Michael Sterrett
+ accelerator3d-0.1.1-r2.ebuild:
+ tidy
01 Dec 2013; Julian Ospald
accelerator3d-0.1.1-r2.ebuild:
[gentoo-commits] gentoo-x86 commit in games-strategy/lightyears: lightyears-1.4-r1.ebuild ChangeLog
mr_bones_14/12/31 23:53:50
Modified: ChangeLog
Added:lightyears-1.4-r1.ebuild
Log:
convert to python-single-r1; EAPI=5
(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Revision ChangesPath
1.18 games-strategy/lightyears/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/lightyears/ChangeLog?rev=1.18&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/lightyears/ChangeLog?rev=1.18&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/lightyears/ChangeLog?r1=1.17&r2=1.18
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/games-strategy/lightyears/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ChangeLog 22 Jan 2013 18:06:20 - 1.17
+++ ChangeLog 31 Dec 2014 23:53:50 - 1.18
@@ -1,6 +1,12 @@
# ChangeLog for games-strategy/lightyears
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/lightyears/ChangeLog,v 1.17
2013/01/22 18:06:20 mr_bones_ Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lightyears/ChangeLog,v 1.18
2014/12/31 23:53:50 mr_bones_ Exp $
+
+*lightyears-1.4-r1 (31 Dec 2014)
+
+ 31 Dec 2014; Michael Sterrett
+ +lightyears-1.4-r1.ebuild:
+ convert to python-single-r1; EAPI=5
22 Jan 2013; Michael Sterrett
-files/lightyears-1.3a-gentoo.patch, -lightyears-1.3a.ebuild:
1.1 games-strategy/lightyears/lightyears-1.4-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/lightyears/lightyears-1.4-r1.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/lightyears/lightyears-1.4-r1.ebuild?rev=1.1&content-type=text/plain
Index: lightyears-1.4-r1.ebuild
===
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header:
/var/cvsroot/gentoo-x86/games-strategy/lightyears/lightyears-1.4-r1.ebuild,v
1.1 2014/12/31 23:53:50 mr_bones_ Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
inherit eutils python-single-r1 games
DESCRIPTION="a single-player game with a science-fiction theme"
HOMEPAGE="http://www.jwhitham.org.uk/20kly/";
SRC_URI="http://www.jwhitham.org.uk/20kly/${P}.tar.bz2";
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="dev-python/pygame[${PYTHON_USEDEP}]
${PYTHON_DEPS}"
RDEPEND=${DEPEND}
REQUIRED_USE=${PYTHON_REQUIRED_USE}
src_prepare() {
epatch "${FILESDIR}/${P}"-gentoo.patch
sed -i \
-e "s:@GENTOO_LIBDIR@:$(games_get_libdir)/${PN}:" \
-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
${PN} || die
python_fix_shebang .
}
src_install() {
dogamesbin ${PN}
insinto "$(games_get_libdir)/${PN}"
doins code/*.py
dodoc README.txt
insinto "${GAMES_DATADIR}/${PN}"
doins -r audio data manual
python_optimize "${D}$(games_get_libdir)/${PN}"
newicon data/32.png ${PN}.png
make_desktop_entry ${PN} "Light Years Into Space"
prepgamesdirs
}
pkg_setup() {
python-single-r1_pkg_setup
games_pkg_setup
}
[gentoo-commits] gentoo-x86 commit in sys-apps/sdparm: ChangeLog sdparm-1.09.ebuild
polynomial-c14/12/31 22:21:10
Modified: ChangeLog sdparm-1.09.ebuild
Log:
Fixed dependency on sg3_utils. Thanks to Jiří Moravec for reporting this in
bug #534142.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
0x981CA6FC)
Revision ChangesPath
1.81 sys-apps/sdparm/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/sdparm/ChangeLog?rev=1.81&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/sdparm/ChangeLog?rev=1.81&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/sdparm/ChangeLog?r1=1.80&r2=1.81
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/sys-apps/sdparm/ChangeLog,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- ChangeLog 29 Dec 2014 12:56:00 - 1.80
+++ ChangeLog 31 Dec 2014 22:21:10 - 1.81
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/sdparm
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sdparm/ChangeLog,v 1.80 2014/12/29
12:56:00 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sdparm/ChangeLog,v 1.81 2014/12/31
22:21:10 polynomial-c Exp $
+
+ 31 Dec 2014; Lars Wendler sdparm-1.09.ebuild:
+ Fixed dependency on sg3_utils. Thanks to Jiří Moravec for reporting this in
+ bug #534142.
*sdparm-1.09 (29 Dec 2014)
1.2 sys-apps/sdparm/sdparm-1.09.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/sdparm/sdparm-1.09.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/sdparm/sdparm-1.09.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/sdparm/sdparm-1.09.ebuild?r1=1.1&r2=1.2
Index: sdparm-1.09.ebuild
===
RCS file: /var/cvsroot/gentoo-x86/sys-apps/sdparm/sdparm-1.09.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sdparm-1.09.ebuild 29 Dec 2014 12:56:00 - 1.1
+++ sdparm-1.09.ebuild 31 Dec 2014 22:21:10 - 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sdparm/sdparm-1.09.ebuild,v 1.1
2014/12/29 12:56:00 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sdparm/sdparm-1.09.ebuild,v 1.2
2014/12/31 22:21:10 polynomial-c Exp $
EAPI="4"
@@ -14,7 +14,7 @@
IUSE=""
# Older releases contain a conflicting sas_disk_blink
-RDEPEND=">=sys-apps/sg3_utils-1.28"
+RDEPEND=">=sys-apps/sg3_utils-1.39"
DEPEND="${RDEPEND}"
DOCS=( AUTHORS ChangeLog CREDITS README notes.txt )
[gentoo-commits] proj/gentoo-keys:master commit in: /
commit: 27c8f38d47af70db32b205a22c63cbd9c11623bc Author: Brian Dolbec gentoo org> AuthorDate: Wed Dec 31 21:54:41 2014 + Commit: Brian Dolbec gentoo org> CommitDate: Wed Dec 31 21:54:41 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=27c8f38d Bump. Signed-off-by: Brian Dolbec gentoo.org>
[gentoo-commits] proj/gentoo-keys:master commit in: /
commit: 2640e8c37172fe2d1d70ccef515911ee56fdf112 Author: Brian Dolbec gentoo org> AuthorDate: Wed Dec 31 21:52:30 2014 + Commit: Brian Dolbec gentoo org> CommitDate: Wed Dec 31 21:52:30 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=2640e8c3 Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/gentoo-keys
[gentoo-commits] proj/gentoo-keys:master commit in: /
commit: 1faf270e4339b4f6fa045c015228d54a1923a22a Author: Brian Dolbec gentoo org> AuthorDate: Wed Dec 31 21:52:39 2014 + Commit: Brian Dolbec gentoo org> CommitDate: Wed Dec 31 21:52:39 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=1faf270e Bump. Signed-off-by: Brian Dolbec gentoo.org>
[gentoo-commits] proj/gentoo-keys:master commit in: /
commit: 3aceadef1cff601af3b239706fe11fee52b3ca23 Author: Brian Dolbec gentoo org> AuthorDate: Wed Dec 31 21:47:04 2014 + Commit: Brian Dolbec gentoo org> CommitDate: Wed Dec 31 21:47:04 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=3aceadef Bump. Signed-off-by: Brian Dolbec gentoo.org>
[gentoo-commits] proj/gentoo-keys:master commit in: /
commit: c2f0eb313a65b6c766482b6e5dfcac46a12eff88 Author: Robin H. Johnson gentoo org> AuthorDate: Wed Dec 31 21:49:21 2014 + Commit: Robin H. Johnson gentoo org> CommitDate: Wed Dec 31 21:49:21 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=c2f0eb31 Bump. Signed-off-by: Robin H. Johnson gentoo.org>
[gentoo-commits] proj/gentoo-keys:master commit in: /
commit: fa7d3f6afeb667ecbc59fe4bcb37618dee253538 Author: Robin H. Johnson gentoo org> AuthorDate: Wed Dec 31 21:42:56 2014 + Commit: Robin H. Johnson gentoo org> CommitDate: Wed Dec 31 21:42:56 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=fa7d3f6a Bump. Signed-off-by: Robin H. Johnson gentoo.org>
[gentoo-commits] proj/gentoo-keys:master commit in: /
commit: 6ade9463f5293d16db2f9e566a7a3cf7b50cbe67 Author: Robin H. Johnson gentoo org> AuthorDate: Wed Dec 31 21:38:11 2014 + Commit: Robin H. Johnson gentoo org> CommitDate: Wed Dec 31 21:38:11 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=6ade9463 Bump. Signed-off-by: Robin H. Johnson gentoo.org>
[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/
commit: 5d9e409c8e2dbd6c93052f848b02740bf8dc58c2
Author: Brian Dolbec gentoo org>
AuthorDate: Sat Dec 27 21:37:23 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Tue Dec 30 21:42:26 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=5d9e409c
gkeys/gkey.py: Add keys and uid fields, update() to GKEY
keys field will hold the primary key fingerprints for the (to be/) installed
GKEY.
fingerprints and uid fileds will be populated with all uid's and fingerprints
defined in subkeys using the update().
---
gkeys/gkeys/gkey.py | 32 +---
1 file changed, 29 insertions(+), 3 deletions(-)
diff --git a/gkeys/gkeys/gkey.py b/gkeys/gkeys/gkey.py
index 41c6d8b..463f007 100644
--- a/gkeys/gkeys/gkey.py
+++ b/gkeys/gkeys/gkey.py
@@ -18,6 +18,7 @@ GKEY_STRING = '''--
Name.: %(name)s
Nick.: %(nick)s
Keydir...: %(keydir)s
+UID..: %(uid)s
'''
GKEY_FINGERPRINTS = \
@@ -26,10 +27,11 @@ GKEY_FINGERPRINTS = \
'''
-class GKEY(namedtuple('GKEY', ['nick', 'name', 'keydir', 'fingerprint'])):
+class GKEY(namedtuple('GKEY', ['nick', 'name', 'keydir', 'keys',
'fingerprint', 'uid'])):
'''Class to hold the relavent info about a key'''
-field_types = {'nick': str, 'name': str, 'keydir': str, 'fingerprint':
list}
+field_types = {'nick': str, 'name': str, 'keydir': str, 'keys': list,
+'fingerprint': list, 'uid': list}
__slots__ = ()
@@ -42,7 +44,12 @@ class GKEY(namedtuple('GKEY', ['nick', 'name', 'keydir',
'fingerprint'])):
@property
def pretty_print(self):
'''Pretty printing a GKEY'''
-gkey = {'name': self.name, 'nick': self.nick, 'keydir': self.keydir}
+gkey = {
+'name': self.name,
+'nick': self.nick,
+'keydir': self.keydir,
+'uid': self.uid,
+}
output = GKEY_STRING % gkey
for f in self.fingerprint:
fingerprint = {'fingerprint': f, 'keyid': '0x' + f[-16:]}
@@ -50,6 +57,25 @@ class GKEY(namedtuple('GKEY', ['nick', 'name', 'keydir',
'fingerprint'])):
return output
+def update(self, result_list):
+'''Processes a results instance from a colon listing
+and mines all fingerprints found.
+
+@param result_list: list of pyGPG.output.GPGResult instances
+(one for each fingerprint in the list)
+@return: A new, updated GKEY instance
+'''
+fingerprints = set()
+uids = set()
+for result in result_list:
+for data in result.status.data:
+if data.name == "FPR":
+fingerprints.add(data.fingerprint)
+elif data.name == "UID":
+uids.add(data.user_ID)
+return self._make([self.nick, self.name, self.keydir, self.keys,
list(fingerprints), sorted(uids)])
+
+
class GKEY_CHECK(namedtuple('GKEY_CHECK', ['keyid', 'revoked', 'expired',
'invalid', 'sign'])):
__slots__ = ()
[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/
commit: 1626d81d20474cb55620bf19aa12924b28a795e9
Author: Brian Dolbec gentoo org>
AuthorDate: Sat Dec 27 21:56:14 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Tue Dec 30 21:42:26 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=1626d81d
gkeys/lib.py: Add the new GKEY.update() to add_key and refresh_key
This updates our installed gkey.seed with all fingerprints including sub-keys
and uid's. This way searches for keys used to sign files can be found if the
key used to sign the file was not a primary key.
---
gkeys/gkeys/lib.py | 24 +---
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/gkeys/gkeys/lib.py b/gkeys/gkeys/lib.py
index 67c94ae..f8e6615 100644
--- a/gkeys/gkeys/lib.py
+++ b/gkeys/gkeys/lib.py
@@ -158,9 +158,8 @@ class GkeysGPG(GPG):
message += "\n gkey..: %s" % (str(gkey.fingerprint))
logger.error(message)
# Save the gkey seed to the installed db
-self.seedfile.update(gkey)
-if not self.seedfile.save():
-logger.error("GkeysGPG.add_key(); failed to save seed: " +
gkey.nick)
+success = self.update_gkey(gkey, save=True)
+if not success:
return []
results.append(result)
return results
@@ -190,21 +189,32 @@ class GkeysGPG(GPG):
self.set_keyserver()
self.set_keydir(gkey.keydir, 'refresh-keys', reset=True)
self.set_keyring('pubring.gpg', 'refresh-keys', reset=False)
+self.set_keyseedfile()
logger.debug("LIB: refresh_key, gkey: %s" % str(gkey))
logger.debug("** Calling runGPG with Running 'gpg %s --refresh-keys'
for: %s"
% (' '.join(self.config.get_key('tasks', 'refresh-keys')),
str(gkey)))
result = self.runGPG(task='refresh-keys', inputfile='')
logger.info('GPG return code: ' + str(result.returncode))
+self.update_gkey(gkey, save=True)
return result
-def update_key(self, gkey, keydir):
+def update_gkey(self, gkey, save=False):
'''Update the specified key in the specified keydir
@param key: tuple of (name, nick, keydir, fingerprint)
@param keydir: the keydir to add the key to
'''
-return []
+# Update the gkey seed and save it to the installed db
+lresults = []
+for fpr in gkey.keys:
+lresults.append(self.list_keys(gkey.keydir, fpr, colons=True))
+self.seedfile.update(gkey.update(lresults))
+if save and not self.seedfile.save():
+logger.error("GkeysGPG.refresh_key(); failed to save seed: " +
gkey.nick)
+return False
+return True
+
def list_keys(self, keydir, fingerprint=None, colons=False):
@@ -225,7 +235,7 @@ class GkeysGPG(GPG):
task = 'list-keys'
target = keydir
self.set_keydir(keydir, task, fingerprint=True)
-self.config.options['tasks'][task].extend(['--keyid-format', 'long',
'--with-fingerprint'])
+self.config.options['tasks'][task].extend(['--keyid-format', 'long',
'--fingerprint', '--fingerprint'])
if colons:
task_value = ['--with-colons']
self.config.options['tasks'][task].extend(task_value)
@@ -315,7 +325,7 @@ class GkeysGPG(GPG):
return results
-def set_keyseedfile(self, trap_errors):
+def set_keyseedfile(self, trap_errors=True):
if not self.keydir:
logger.debug("GkeysGPG.set_keyseedfile(); self.keydir error")
self.seedfile = Seeds(pjoin(self.keydir, 'gkey.seeds'), self.config)
[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/
commit: d1c8f1bcf372055636628ae9b219d4c73f91a0d2
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Dec 28 08:23:36 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Tue Dec 30 21:42:26 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=d1c8f1bc
gkeys/actions.py: Fix broken key-search printing
---
gkeys/gkeys/actions.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py
index 1d3a927..03789fa 100644
--- a/gkeys/gkeys/actions.py
+++ b/gkeys/gkeys/actions.py
@@ -908,8 +908,7 @@ class Actions(object):
msgs = []
for cat in list(keys):
msgs.append("Category: %s" % cat)
-for result in keys[cat]:
-msgs.append(result)
+msgs.append(keys[cat])
del keys, found, cat, result, handler
return (True, msgs)
[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/
commit: b738dd11378cb4229fa2db3632f815627c2d746b
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Dec 28 00:56:25 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Tue Dec 30 21:42:26 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=b738dd11
gkeys/actions.py: Improve verification messages and info
---
gkeys/gkeys/actions.py | 12
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py
index b92f3a2..1d3a927 100644
--- a/gkeys/gkeys/actions.py
+++ b/gkeys/gkeys/actions.py
@@ -680,10 +680,13 @@ class Actions(object):
return (False, ['No installed keys found, try installkey action.'])
key = handler.seeds.nick_search(args.nick)
if not key:
-messages.append("Failed to find nick: %s in %s category"
-% (args.nick, args.category))
+if args.nick:
+messages.append("Failed to find.: %s in category: %s"
+% (args.category, args.nick))
args.category = self.config.get_key('verify-keyring')
args.nick = self.config.get_key('verify-nick')
+messages.append("Using config defaults..: %s %s"
+% (args.category, args.nick))
return self.verify(args, messages)
keyrings = self.config.get_key('keyring')
@@ -759,14 +762,15 @@ class Actions(object):
verified = True
messages.extend(["Verification succeeded.: %s" % (filepath),
"Key info...: %s <%s>, %s"
-% ( key.name, key.nick, keyid)])
+% ( key.name, key.nick, keyid),
+"category, nick.: %s %s" % (args.category,
args.nick)])
else:
messages.extend(["Verification failed: %s" % (filepath),
"Key info...: %s <%s>, %s"
% ( key.name, key.nick, keyid)])
has_no_pubkey, s_keyid = results.no_pubkey
if has_no_pubkey:
-messages.append("Auto-searching for key.: %s" % s_keyid)
+messages.append("Auto-searching for key.: 0x%s" % s_keyid)
# reset all but keyid and pass thru data
args.keyid = s_keyid
args.keydir = None
[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/
commit: c9fbd425cd4637972aa951f7b159ec3bae9655cf
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Dec 28 17:38:19 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Tue Dec 30 21:42:27 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=c9fbd425
gkeys/actions.py: Rename key-search action to search-key for consistency
---
gkeys/gkeys/actions.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py
index 2a68739..9b44cc8 100644
--- a/gkeys/gkeys/actions.py
+++ b/gkeys/gkeys/actions.py
@@ -35,7 +35,7 @@ Seed_Actions = ['seeds', 'add-seed', 'fetch-seed',
'list-cats',
'list-seed', 'list-seedfiles', 'move-seed', 'remove-seed']
Key_Actions = ['keys-', 'check-key', 'import-key', 'installed',
-'install-key', 'key-search', 'list-key', 'move-key', 'refresh-key',
'remove-key',
+'install-key', 'search-key', 'list-key', 'move-key', 'refresh-key',
'remove-key',
'spec-check']
General_Actions = ['---general---', 'sign','verify']
@@ -56,7 +56,7 @@ Action_Options = {
'move-key': ['nick', 'name', 'keydir', 'keys', 'fingerprint', 'category',
'keyring', 'dest'],
'installed': ['nick', 'name', 'keydir', 'keys', 'fingerprint', 'category',
'keyring'],
'import-key': ['nick', 'name', 'keydir', 'keys', 'fingerprint',
'category', 'keyring'],
-'key-search': ['nick', '1name', 'keydir', 'keys', 'fingerprint', 'keyid',
'uid', 'category', 'exact', 'all'],
+'search-key': ['nick', '1name', 'keydir', 'keys', 'fingerprint', 'keyid',
'uid', 'category', 'exact', 'all'],
'verify': ['dest', 'nick', 'name', 'keydir', 'keys', 'fingerprint',
'category', '1file', 'signature', 'timestamp'],
'check-key': ['nick', 'name', 'keydir', 'keys', 'fingerprint', 'category',
'keyring', 'keyid'],
'sign': ['nick', 'name', 'keydir', 'fingerprint', 'file', 'keyring'],
@@ -81,7 +81,7 @@ Action_Map = {
'move-key': 'movekey',
'installed': 'installed',
'import-key': 'importkey',
-'key-search': 'key_search',
+'search-key': 'key_search',
'verify': 'verify',
'check-key': 'checkkey',
'sign': 'sign',
[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/
commit: 7878398cdf5743d138987d5e6230b2a4d5c095a4
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Dec 28 08:38:40 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Tue Dec 30 21:42:26 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=7878398c
gkeys/actions.py: Add uid search support
---
gkeys/gkeys/actions.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py
index 03789fa..391d478 100644
--- a/gkeys/gkeys/actions.py
+++ b/gkeys/gkeys/actions.py
@@ -56,7 +56,7 @@ Action_Options = {
'move-key': ['nick', 'name', 'keydir', 'keys', 'fingerprint', 'category',
'keyring', 'dest'],
'installed': ['nick', 'name', 'keydir', 'keys', 'fingerprint', 'category',
'keyring'],
'import-key': ['nick', 'name', 'keydir', 'keys', 'fingerprint',
'category', 'keyring'],
-'key-search': ['nick', '1name', 'keydir', 'keys', 'fingerprint', 'keyid',
'category', 'exact', 'all'],
+'key-search': ['nick', '1name', 'keydir', 'keys', 'fingerprint', 'keyid',
'uid', 'category', 'exact', 'all'],
'verify': ['dest', 'nick', 'name', 'keydir', 'keys', 'fingerprint',
'category', '1file', 'signature', 'timestamp'],
'check-key': ['nick', 'name', 'keydir', 'keys', 'fingerprint', 'category',
'keyring', 'keyid'],
'sign': ['nick', 'name', 'keydir', 'fingerprint', 'file', 'keyring'],
@@ -881,7 +881,7 @@ class Actions(object):
handler = SeedHandler(self.logger, self.config)
results = {}
search_args = [x for x in
-['nick', 'name', 'keydir', 'fingerprint', 'keyid']
+['nick', 'name', 'keydir', 'fingerprint', 'keyid', 'uid']
if getattr(args, x)]
if args.category:
handler.load_category(args.category)
@@ -909,6 +909,6 @@ class Actions(object):
for cat in list(keys):
msgs.append("Category: %s" % cat)
msgs.append(keys[cat])
-del keys, found, cat, result, handler
+del keys, cat, handler
return (True, msgs)
[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/
commit: 6933a2cc528c124aeb8f1b6d59ac636b9819b167
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Dec 28 08:44:06 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Tue Dec 30 21:42:26 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=6933a2cc
gkeys/actions.py: Alignment tweak for key-search message
---
gkeys/gkeys/actions.py | 2 +-
gkeys/gkeys/base.py| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py
index 391d478..0dbdf24 100644
--- a/gkeys/gkeys/actions.py
+++ b/gkeys/gkeys/actions.py
@@ -907,7 +907,7 @@ class Actions(object):
return keys
msgs = []
for cat in list(keys):
-msgs.append("Category: %s" % cat)
+msgs.append("Category.: %s" % cat)
msgs.append(keys[cat])
del keys, cat, handler
return (True, msgs)
diff --git a/gkeys/gkeys/base.py b/gkeys/gkeys/base.py
index 2c0e114..2ec4375 100644
--- a/gkeys/gkeys/base.py
+++ b/gkeys/gkeys/base.py
@@ -300,7 +300,7 @@ class CliBase(object):
print(header)
for msg in results:
if type(msg) in [str, unicode]:
-print('', msg)
+print(' ', msg)
else:
try:
print("\n".join([x.pretty_print for x in msg]))
[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/
commit: 9ee49f508de378f6b7a366d8c9dba062e2be3f24
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Dec 28 00:25:24 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Tue Dec 30 21:42:26 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=9ee49f50
gkeys/actions.py: Add auto-search capability to verify
If verification fails with NO_PUBKEY, it then does a search for the correct
verification keyring to verify with.
---
gkeys/gkeys/actions.py | 86 ++
1 file changed, 59 insertions(+), 27 deletions(-)
diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py
index 4a4f0eb..b92f3a2 100644
--- a/gkeys/gkeys/actions.py
+++ b/gkeys/gkeys/actions.py
@@ -659,14 +659,15 @@ class Actions(object):
pass
-def verify(self, args):
-'''File verification action'''
-connector_output = {
- 'info': self.logger.debug,
- 'error': self.logger.error,
- 'kwargs-info': {},
- 'kwargs-error': {},
-}
+def verify(self, args, messages=None):
+'''File verification action
+
+@ param args: argparse.parse_args instance
+@param messages: list, private internal option used for recursion only
+'''
+if messages == None:
+messages = []
+
if not args.filename:
return (False, ['Please provide a signed file.'])
if not args.category:
@@ -677,10 +678,24 @@ class Actions(object):
keys = handler.load_category(args.category)
if not keys:
return (False, ['No installed keys found, try installkey action.'])
+key = handler.seeds.nick_search(args.nick)
+if not key:
+messages.append("Failed to find nick: %s in %s category"
+% (args.nick, args.category))
+args.category = self.config.get_key('verify-keyring')
+args.nick = self.config.get_key('verify-nick')
+return self.verify(args, messages)
+
keyrings = self.config.get_key('keyring')
catdir = os.path.join(keyrings, args.category)
self.logger.debug("ACTIONS: verify; catdir = %s" % catdir)
self.gpg = GkeysGPG(self.config, catdir)
+return self._verify(args, handler, key, messages)
+
+
+def _verify(self, args, handler, key, messages=None):
+if messages == None:
+messages = []
filepath, signature = args.filename, args.signature
timestamp_path = None
isurl = success = verified = False
@@ -715,7 +730,7 @@ class Actions(object):
self.logger.debug("ACTIONS: verify; local file %s" % filepath)
success = os.path.isfile(filepath)
if not success:
-messages = ["File %s cannot be retrieved." % filepath]
+messages.append("File %s cannot be retrieved." % filepath)
else:
if not signature:
EXTENSIONS = ['.sig', '.asc', 'gpg','.gpgsig']
@@ -735,26 +750,36 @@ class Actions(object):
break
else:
sig_path = signature
-messages = []
self.logger.info("Verifying file...")
verified = False
-key = keys.nick_search(args.nick)
-if not key:
-messages.append("Failed to find nick: %s in %s category"
-% (args.nick, args.category))
-return (False, messages)
results = self.gpg.verify_file(key, sig_path, filepath)
keyid = key.keyid[0]
(valid, trust) = results.verified
if valid:
verified = True
-messages = ["Verification succeeded.: %s" % (filepath),
+messages.extend(["Verification succeeded.: %s" % (filepath),
"Key info...: %s <%s>, %s"
-% ( key.name, key.nick, keyid)]
+% ( key.name, key.nick, keyid)])
else:
-messages = ["Verification failed. %s:" % (filepath),
-"Key info: %s <%s>, %s"
-% ( key.name, key.nick, keyid)]
+messages.extend(["Verification failed: %s" % (filepath),
+"Key info...: %s <%s>, %s"
+% ( key.name, key.nick, keyid)])
+has_no_pubkey, s_keyid = results.no_pubkey
+if has_no_pubkey:
+messages.append("Auto-searching for key.: %s" % s_keyid)
+# reset all but keyid and pass thru data
+args.keyid = s_keyid
+args.keydir = None
+args.fingerprint = None
+args.exact = False
+args.category = None
+args.nick = None
+args.name = None
+args.
[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/
commit: eef89beeb23c6c539944b9f09d038fa821912667
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Dec 28 16:54:10 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Tue Dec 30 21:42:26 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=eef89bee
gkeys/exception.py: Initial creation of GkeyException classes
Mostly copied, modified from PortageException code.
---
gkeys/gkeys/exception.py | 78
1 file changed, 78 insertions(+)
diff --git a/gkeys/gkeys/exception.py b/gkeys/gkeys/exception.py
new file mode 100644
index 000..21a2e97
--- /dev/null
+++ b/gkeys/gkeys/exception.py
@@ -0,0 +1,78 @@
+# Copyright 1998-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+
+import sys
+
+
+if sys.version_info[0] >= 3:
+# pylint: disable=W0622
+basestring = str
+
+def _unicode_encode(s, encoding='utf_8', errors='backslashreplace'):
+if isinstance(s, str):
+s = s.encode(encoding, errors)
+return s
+
+def _unicode_decode(s, encoding='utf_8', errors='replace'):
+if isinstance(s, bytes):
+s = str(s, encoding=encoding, errors=errors)
+return s
+
+else:
+
+def _unicode_encode(s, encoding='utf_8', errors='backslashreplace'):
+if isinstance(s, unicode):
+s = s.encode(encoding, errors)
+return s
+
+def _unicode_decode(s, encoding='utf_8', errors='replace'):
+if isinstance(s, bytes):
+s = unicode(s, encoding=encoding, errors=errors)
+return s
+
+
+class GkeysException(Exception):
+if sys.version_info[0] >= 3:
+def __init__(self, value):
+self.value = value[:]
+
+def __str__(self):
+if isinstance(self.value, str):
+return self.value
+else:
+return repr(self.value)
+else:
+def __init__(self, value):
+self.value = value[:]
+if isinstance(self.value, basestring):
+self.value = _unicode_decode(self.value,
+encoding='utf_8', errors='replace')
+
+def __unicode__(self):
+if isinstance(self.value, unicode):
+return self.value
+else:
+return _unicode_decode(repr(self.value),
+encoding='utf_8', errors='replace')
+
+def __str__(self):
+if isinstance(self.value, unicode):
+return _unicode_encode(self.value,
+encoding='utf_8', errors='backslashreplace')
+else:
+return repr(self.value)
+
+
+class UpdateDbError(GkeysException):
+'''%s
+
+Please Run: 'gkeys refresh-key -C {foo}'
+on all installed keyring categories
+Then continue with normal gkey operations.'''
+def __init__(self, value):
+doc = self.__doc__ % (value)
+GkeysException.__init__(self, doc)
+
+
+
[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/
commit: 244ace4fee1054945eb97aad31919dba71374b0b
Author: Brian Dolbec gentoo org>
AuthorDate: Fri Dec 26 21:15:22 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Tue Dec 30 21:42:25 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=244ace4f
gkeys: Add key-search action
Add _list_search() sub function.
Add category output and grouping.
Fix arg as a list searching as well as seed values as a list.
Use recursion to get to single value searches.
Make nick search to be partial unless --exact specified.
Move main key_search code to SeedHandler class, it is much better suited to
this class.
Add 1name subparser option for single name entries only
Add seen tracking in key_search to eliminate duplicates
Add --all option to key-search
If --all is specified, it filters out search results to match a seed for all
criteria specified.
---
gkeys/gkeys/actions.py | 34 --
gkeys/gkeys/base.py| 17 +
gkeys/gkeys/seed.py| 43 ++-
gkeys/gkeys/seedhandler.py | 25 +
4 files changed, 116 insertions(+), 3 deletions(-)
diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py
index ded3df7..be1823f 100644
--- a/gkeys/gkeys/actions.py
+++ b/gkeys/gkeys/actions.py
@@ -35,7 +35,7 @@ Seed_Actions = ['seeds', 'add-seed', 'fetch-seed',
'list-cats',
'list-seed', 'list-seedfiles', 'move-seed', 'remove-seed']
Key_Actions = ['keys-', 'check-key', 'import-key', 'installed',
-'install-key', 'list-key', 'move-key', 'refresh-key', 'remove-key',
+'install-key', 'key-search', 'list-key', 'move-key', 'refresh-key',
'remove-key',
'spec-check']
General_Actions = ['---general---', 'sign','verify']
@@ -56,6 +56,7 @@ Action_Options = {
'move-key': ['nick', 'name', 'keydir', 'fingerprint', 'category',
'keyring', 'dest'],
'installed': ['nick', 'name', 'keydir', 'fingerprint', 'category',
'keyring'],
'import-key': ['nick', 'name', 'keydir', 'fingerprint', 'category',
'keyring'],
+'key-search': ['nick', '1name', 'keydir', 'fingerprint', 'keyid',
'category', 'exact', 'all'],
'verify': ['dest', 'nick', 'name', 'keydir', 'fingerprint', 'category',
'1file', 'signature', 'timestamp'],
'check-key': ['nick', 'name', 'keydir', 'fingerprint', 'category',
'keyring', 'keyid'],
'sign': ['nick', 'name', 'keydir', 'fingerprint', 'file', 'keyring'],
@@ -80,6 +81,7 @@ Action_Map = {
'move-key': 'movekey',
'installed': 'installed',
'import-key': 'importkey',
+'key-search': 'key_search',
'verify': 'verify',
'check-key': 'checkkey',
'sign': 'sign',
@@ -845,5 +847,33 @@ class Actions(object):
return (True, ['Completed'])
-
+def key_search(self, args):
+'''Search for a key's seed field in the installed keys db'''
+handler = SeedHandler(self.logger, self.config)
+results = {}
+search_args = [x for x in
+['nick', 'name', 'keydir', 'fingerprint', 'keyid']
+if getattr(args, x)]
+if args.category:
+handler.load_category(args.category)
+results[args.category] = handler.key_search(args, search_args)
+else:
+for cat in list(self.config.get_key('seeds')):
+handler.load_category(cat)
+found = handler.key_search(args, search_args)
+if found:
+if cat in results:
+results[cat].extend(found)
+else:
+results[cat] = found
+msgs = []
+for cat in results:
+msgs.append("Category: %s" % cat)
+seen = []
+for result in results[cat]:
+if result and result.nick not in seen:
+if isinstance(result, GKEY):
+seen.append(result)
+msgs.append(seen)
+return (True, msgs)
diff --git a/gkeys/gkeys/base.py b/gkeys/gkeys/base.py
index 499c291..541a12c 100644
--- a/gkeys/gkeys/base.py
+++ b/gkeys/gkeys/base.py
@@ -46,11 +46,23 @@ class CliBase(object):
@staticmethod
+def _option_all(parser=None):
+parser.add_argument('-a', '--all', dest='all',
+action='store_true', default=False,
+help='Match all inputs arguments in searches')
+
+@staticmethod
def _option_dest(parser=None):
parser.add_argument('-d', '--dest', dest='destination', default=None,
help='The destination seed file or keydir for move, copy
operations')
@staticmethod
+def _option_exact(parser=None):
+parser.add_argument('-e', '--exact', dest='exact',
+action='store_true', default=False,
+help='Use CASE matching in searches')
+
+@staticmethod
def _option_fingerprint(parser=None):
parser.add_argument('-f', '--fingerp
[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/
commit: 6d02096f1b8afbf3ed2126def65cfbe2d65d0237
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Dec 28 08:24:22 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Tue Dec 30 21:42:26 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=6d02096f
gkeys/gkey.py: Separate uid string printing for list type output
---
gkeys/gkeys/gkey.py | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/gkeys/gkeys/gkey.py b/gkeys/gkeys/gkey.py
index 463f007..130a5d5 100644
--- a/gkeys/gkeys/gkey.py
+++ b/gkeys/gkeys/gkey.py
@@ -18,7 +18,10 @@ GKEY_STRING = '''--
Name.: %(name)s
Nick.: %(nick)s
Keydir...: %(keydir)s
-UID..: %(uid)s
+'''
+
+GKEY_UID = \
+'''UID..: %(uid)s
'''
GKEY_FINGERPRINTS = \
@@ -48,9 +51,10 @@ class GKEY(namedtuple('GKEY', ['nick', 'name', 'keydir',
'keys', 'fingerprint',
'name': self.name,
'nick': self.nick,
'keydir': self.keydir,
-'uid': self.uid,
}
output = GKEY_STRING % gkey
+for uid in self.uid:
+output += GKEY_UID % {'uid': uid}
for f in self.fingerprint:
fingerprint = {'fingerprint': f, 'keyid': '0x' + f[-16:]}
output += GKEY_FINGERPRINTS % fingerprint
[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/
commit: 3a59f3c4f95e5136d03805049c9af638de96dde4
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Dec 28 17:03:35 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Tue Dec 30 21:42:26 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=3a59f3c4
gkeys: Add UpdateDbError exception usage
---
gkeys/gkeys/actions.py | 2 +-
gkeys/gkeys/lib.py | 6 +++---
gkeys/gkeys/seed.py| 7 ++-
gkeys/gkeys/seedhandler.py | 11 ---
4 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py
index 0dbdf24..2a68739 100644
--- a/gkeys/gkeys/actions.py
+++ b/gkeys/gkeys/actions.py
@@ -858,7 +858,7 @@ class Actions(object):
return (False, ["Please specify seeds type."])
self.logger.debug("ACTIONS: refreshkey; args: %s" % str(args))
handler = SeedHandler(self.logger, self.config)
-seeds = handler.load_category(args.category)
+seeds = handler.load_category(args.category, refresh=True)
keyring = self.config.get_key('keyring')
catdir = os.path.join(keyring, args.category)
self.logger.debug("ACTIONS: refreshkey; catdir = %s" % catdir)
diff --git a/gkeys/gkeys/lib.py b/gkeys/gkeys/lib.py
index f8e6615..724abfc 100644
--- a/gkeys/gkeys/lib.py
+++ b/gkeys/gkeys/lib.py
@@ -189,7 +189,7 @@ class GkeysGPG(GPG):
self.set_keyserver()
self.set_keydir(gkey.keydir, 'refresh-keys', reset=True)
self.set_keyring('pubring.gpg', 'refresh-keys', reset=False)
-self.set_keyseedfile()
+self.set_keyseedfile(refresh=True)
logger.debug("LIB: refresh_key, gkey: %s" % str(gkey))
logger.debug("** Calling runGPG with Running 'gpg %s --refresh-keys'
for: %s"
% (' '.join(self.config.get_key('tasks', 'refresh-keys')),
str(gkey)))
@@ -325,11 +325,11 @@ class GkeysGPG(GPG):
return results
-def set_keyseedfile(self, trap_errors=True):
+def set_keyseedfile(self, trap_errors=True, refresh=False):
if not self.keydir:
logger.debug("GkeysGPG.set_keyseedfile(); self.keydir error")
self.seedfile = Seeds(pjoin(self.keydir, 'gkey.seeds'), self.config)
-self.seedfile.load(trap_errors=trap_errors)
+self.seedfile.load(trap_errors=trap_errors, refresh=refresh)
def sign_file(self, gkey, mode, fingerprint, filepath):
diff --git a/gkeys/gkeys/seed.py b/gkeys/gkeys/seed.py
index 67354f3..1a2bae2 100644
--- a/gkeys/gkeys/seed.py
+++ b/gkeys/gkeys/seed.py
@@ -19,6 +19,7 @@ with gentoo-keys specific convienience functions.
import json
import os
+from gkeys.exception import UpdateDbError
from gkeys.log import logger
from gkeys.gkey import GKEY
from gkeys.fileops import ensure_dirs
@@ -38,7 +39,7 @@ class Seeds(object):
self.seeds = {}
-def load(self, filename=None, trap_errors=True):
+def load(self, filename=None, trap_errors=True, refresh=False):
'''Load the seed file into memory'''
if filename:
self.filename = filename
@@ -59,8 +60,12 @@ class Seeds(object):
for seed in list(seedlines.items()):
# GKEY class change auto-update
if not 'uid' in list(seed[1]):
+if not refresh:
+raise UpdateDbError(filename)
seed[1]['uid'] = []
if not 'keys' in list(seed[1]):
+if not refresh:
+raise UpdateDbError(filename)
seed[1]['keys'] = seed[1]['fingerprint'][:]
#try:
diff --git a/gkeys/gkeys/seedhandler.py b/gkeys/gkeys/seedhandler.py
index a9fb720..5ddccbe 100644
--- a/gkeys/gkeys/seedhandler.py
+++ b/gkeys/gkeys/seedhandler.py
@@ -14,6 +14,7 @@ import os
import re
from json import load
+from gkeys.exception import UpdateDbError
from gkeys.gkey import GKEY
from gkeys.seed import Seeds
from gkeys.fileops import ensure_dirs
@@ -58,7 +59,7 @@ class SeedHandler(object):
pass
return keyinfo
-def load_seeds(self, seedfile=None, filepath=None):
+def load_seeds(self, seedfile=None, filepath=None, refresh=False):
'''Load seed file
@param seeds: string of the short name seed file
@@ -77,11 +78,11 @@ class SeedHandler(object):
self.logger.debug("SeedHandler: load_seeds; seeds filepath to load: "
"%s" % filepath)
seeds = Seeds(config=self.config)
-seeds.load(filepath)
+seeds.load(filepath, refresh=refresh)
self.seeds = seeds
return seeds
-def load_category(self, category, nicks=None):
+def load_category(self, category, nicks=None, refresh=False):
'''Loads the designated key directories
@param category: string
@@ -113,8 +114,12 @@ class SeedHandler(object):
key = seed[nick]
# GKEY class change auto-update
[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/
commit: ffb2d93b1085c600cee9bd6fa2cf17c098c3bc2c
Author: Brian Dolbec gentoo org>
AuthorDate: Sat Dec 27 21:33:07 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Tue Dec 30 21:42:26 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=ffb2d93b
gkeys: Move all GKEYS definitions to it's own file
Fix imports in other files.
---
gkeys/gkeys/actions.py | 2 +-
gkeys/gkeys/checks.py | 2 +-
gkeys/gkeys/config.py | 41 +-
gkeys/gkeys/gkey.py| 55 ++
gkeys/gkeys/seed.py| 2 +-
gkeys/gkeys/seedhandler.py | 2 +-
6 files changed, 60 insertions(+), 44 deletions(-)
diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py
index be1823f..9baecaa 100644
--- a/gkeys/gkeys/actions.py
+++ b/gkeys/gkeys/actions.py
@@ -27,7 +27,7 @@ from shutil import rmtree
from gkeys.lib import GkeysGPG
from gkeys.seedhandler import SeedHandler
-from gkeys.config import GKEY
+from gkeys.gkey import GKEY
from gkeys.checks import SPECCHECK_SUMMARY, convert_pf, convert_yn
diff --git a/gkeys/gkeys/checks.py b/gkeys/gkeys/checks.py
index 69df9c4..bddad5f 100644
--- a/gkeys/gkeys/checks.py
+++ b/gkeys/gkeys/checks.py
@@ -12,7 +12,7 @@
import time
from collections import namedtuple, OrderedDict
-from gkeys.config import GKEY_CHECK
+from gkeys.gkey import GKEY_CHECK
from pyGPG.mappings import (ALGORITHM_CODES, CAPABILITY_MAP,
KEY_VERSION_FPR_LEN, VALIDITY_MAP, VALID_LIST)
diff --git a/gkeys/gkeys/config.py b/gkeys/gkeys/config.py
index 6eba2b3..8fa4c1b 100644
--- a/gkeys/gkeys/config.py
+++ b/gkeys/gkeys/config.py
@@ -6,14 +6,13 @@
Holds configuration keys and values
-@copyright: 2012 by Brian Dolbec
+@copyright: 2012-2015 by Brian Dolbec
@license: GNU GNU GPL2, see COPYING for details.
"""
import os
from collections import OrderedDict
-from collections import namedtuple
from pyGPG.config import GPGConfig
@@ -30,16 +29,6 @@ EPREFIX = "@GENTOO_PORTAGE_EPREFIX@"
if "GENTOO_PORTAGE_EPREFIX" in EPREFIX:
EPREFIX = ''
-GKEY_STRING = '''--
-Name.: %(name)s
-Nick.: %(nick)s
-Keydir...: %(keydir)s
-'''
-
-GKEY_FINGERPRINTS = \
-'''Keyid: %(keyid)s
- Fingerprint: %(fingerprint)s
-'''
MAPSEEDS = { 'dev' : 'gentoodevs.seeds', 'rel': 'gentoo.seeds' }
@@ -137,31 +126,3 @@ class GKeysConfig(GPGConfig):
else:
return super(GKeysConfig, self)._get_(key, subkey)
-
-class GKEY(namedtuple('GKEY', ['nick', 'name', 'keydir', 'fingerprint'])):
-'''Class to hold the relavent info about a key'''
-
-field_types = {'nick': str, 'name': str, 'keydir': str, 'fingerprint':
list}
-__slots__ = ()
-
-
-@property
-def keyid(self):
-'''Keyid is a substring value of the fingerprint'''
-return ['0x' + x[-16:] for x in self.fingerprint]
-
-
-@property
-def pretty_print(self):
-'''Pretty printing a GKEY'''
-gkey = {'name': self.name, 'nick': self.nick, 'keydir': self.keydir}
-output = GKEY_STRING % gkey
-for f in self.fingerprint:
-fingerprint = {'fingerprint': f, 'keyid': '0x' + f[-16:]}
-output += GKEY_FINGERPRINTS % fingerprint
-return output
-
-
-class GKEY_CHECK(namedtuple('GKEY_CHECK', ['keyid', 'revoked', 'expired',
'invalid', 'sign'])):
-
-__slots__ = ()
diff --git a/gkeys/gkeys/gkey.py b/gkeys/gkeys/gkey.py
new file mode 100644
index 000..41c6d8b
--- /dev/null
+++ b/gkeys/gkeys/gkey.py
@@ -0,0 +1,55 @@
+#
+#-*- coding:utf-8 -*-
+
+"""
+Gentoo-keys - gkey.py
+
+Holds GKEY class and related values
+
+@copyright: 2012-2015 by Brian Dolbec
+@license: GNU GNU GPL2, see COPYING for details.
+"""
+
+
+from collections import namedtuple
+
+
+GKEY_STRING = '''--
+Name.: %(name)s
+Nick.: %(nick)s
+Keydir...: %(keydir)s
+'''
+
+GKEY_FINGERPRINTS = \
+'''Keyid: %(keyid)s
+ Fingerprint: %(fingerprint)s
+'''
+
+
+class GKEY(namedtuple('GKEY', ['nick', 'name', 'keydir', 'fingerprint'])):
+'''Class to hold the relavent info about a key'''
+
+field_types = {'nick': str, 'name': str, 'keydir': str, 'fingerprint':
list}
+__slots__ = ()
+
+
+@property
+def keyid(self):
+'''Keyid is a substring value of the fingerprint'''
+return ['0x' + x[-16:] for x in self.fingerprint]
+
+
+@property
+def pretty_print(self):
+'''Pretty printing a GKEY'''
+gkey = {'name': self.name, 'nick': self.nick, 'keydir': self.keydir}
+output = GKEY_STRING % gkey
+for f in self.fingerprint:
+fingerprint = {'fingerprint': f, 'keyid': '0x' + f[-16:]}
+output += GKEY_FINGERPRINTS % fingerprint
+return output
+
+
+class GKEY_CHECK(namedtuple('GKEY_CHECK', ['keyid', 'revoked', 'expired',
'invalid
[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/
commit: 4a7e7e54a6b6ce280a221a0b039bebafd9d49701
Author: Brian Dolbec gentoo org>
AuthorDate: Sat Dec 27 21:51:17 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Tue Dec 30 21:42:26 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=4a7e7e54
gkeys: Add keys and uid options to actions and seed handling
Add code to auto-update existing installed gkey.seeds files with the additional
data.
---
gkeys/gkeys/actions.py | 32
gkeys/gkeys/base.py| 11 +++
gkeys/gkeys/seed.py| 6 ++
gkeys/gkeys/seedhandler.py | 5 +
4 files changed, 38 insertions(+), 16 deletions(-)
diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py
index 9baecaa..4a4f0eb 100644
--- a/gkeys/gkeys/actions.py
+++ b/gkeys/gkeys/actions.py
@@ -44,24 +44,24 @@ Available_Actions = General_Actions + Key_Actions +
Seed_Actions
Action_Options = {
'list-cats': [],
-'list-seed': ['nick', 'name', 'keydir', 'fingerprint', 'category',
'1file'],
-'add-seed': ['nick', 'name', 'keydir', 'fingerprint', 'category'],
-'remove-seed': ['nick', 'name', 'keydir', 'fingerprint', 'category'],
-'move-seed': ['nick', 'name', 'keydir', 'fingerprint', 'category', 'dest'],
-'fetch-seed': ['nick', 'name', 'keydir', 'fingerprint', 'category',
'keyring'],
+'list-seed': ['nick', 'name', 'keydir', 'keys', 'fingerprint', 'category',
'1file'],
+'add-seed': ['nick', 'name', 'keydir', 'keys', 'fingerprint', 'category',
'uid'],
+'remove-seed': ['nick', 'name', 'keydir', 'keys', 'fingerprint',
'category'],
+'move-seed': ['nick', 'name', 'keydir', 'keys', 'fingerprint', 'category',
'dest'],
+'fetch-seed': ['nick', 'name', 'keydir', 'keys', 'fingerprint',
'category', 'keyring'],
'list-seedfiles': [],
-'list-key': ['nick', 'name', 'keydir', 'fingerprint', 'category',
'keyring', 'gpgsearch', 'keyid'],
-'install-key': ['nick', 'name', 'keydir', 'fingerprint', 'category',
'keyring', '1file'],
-'remove-key': ['nick', 'name', 'keydir', 'fingerprint', 'category',
'keyring'],
-'move-key': ['nick', 'name', 'keydir', 'fingerprint', 'category',
'keyring', 'dest'],
-'installed': ['nick', 'name', 'keydir', 'fingerprint', 'category',
'keyring'],
-'import-key': ['nick', 'name', 'keydir', 'fingerprint', 'category',
'keyring'],
-'key-search': ['nick', '1name', 'keydir', 'fingerprint', 'keyid',
'category', 'exact', 'all'],
-'verify': ['dest', 'nick', 'name', 'keydir', 'fingerprint', 'category',
'1file', 'signature', 'timestamp'],
-'check-key': ['nick', 'name', 'keydir', 'fingerprint', 'category',
'keyring', 'keyid'],
+'list-key': ['nick', 'name', 'keydir', 'keys', 'fingerprint', 'category',
'keyring', 'gpgsearch', 'keyid'],
+'install-key': ['nick', 'name', 'keydir', 'keys', 'fingerprint',
'category', 'keyring', '1file'],
+'remove-key': ['nick', 'name', 'keydir', 'keys', 'fingerprint',
'category', 'keyring'],
+'move-key': ['nick', 'name', 'keydir', 'keys', 'fingerprint', 'category',
'keyring', 'dest'],
+'installed': ['nick', 'name', 'keydir', 'keys', 'fingerprint', 'category',
'keyring'],
+'import-key': ['nick', 'name', 'keydir', 'keys', 'fingerprint',
'category', 'keyring'],
+'key-search': ['nick', '1name', 'keydir', 'keys', 'fingerprint', 'keyid',
'category', 'exact', 'all'],
+'verify': ['dest', 'nick', 'name', 'keydir', 'keys', 'fingerprint',
'category', '1file', 'signature', 'timestamp'],
+'check-key': ['nick', 'name', 'keydir', 'keys', 'fingerprint', 'category',
'keyring', 'keyid'],
'sign': ['nick', 'name', 'keydir', 'fingerprint', 'file', 'keyring'],
-'spec-check': ['nick', 'name', 'keydir', 'fingerprint', 'category',
'keyring', 'keyid'],
-'refresh-key': ['nick', 'name', 'keydir', 'fingerprint', 'category',
'keyring', 'keyid'],
+'spec-check': ['nick', 'name', 'keydir', 'keys', 'fingerprint',
'category', 'keyring', 'keyid'],
+'refresh-key': ['nick', 'name', 'keydir', 'keys', 'fingerprint',
'category', 'keyring', 'keyid'],
'---general---': [],
'seeds': [],
'keys-': [],
diff --git a/gkeys/gkeys/base.py b/gkeys/gkeys/base.py
index 541a12c..2c0e114 100644
--- a/gkeys/gkeys/base.py
+++ b/gkeys/gkeys/base.py
@@ -85,6 +85,12 @@ class CliBase(object):
help='The name of the keyring to use for verification, etc.')
@staticmethod
+def _option_keys(parser=None):
+parser.add_argument('-K', '--keys', dest='keys', nargs='*',
+default=None,
+help='The name of the keyring to use for verification, etc.')
+
+@staticmethod
def _option_nick(parser=None):
parser.add_argument('-n', '--nick', dest='nick', default=None,
help='The nick associated with the the key')
@@ -167,6 +173,11 @@ class CliBase(object):
action='store_true', default=False,
help='Just Do It')
+
[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/, gkeys-ldap/, gkeys-gen/
commit: b5a2090363952c36b729eefa9d0f32298b491a00
Author: Pavlos Ratis gentoo org>
AuthorDate: Tue Dec 30 16:47:37 2014 +
Commit: Pavlos Ratis gentoo org>
CommitDate: Tue Dec 30 16:47:37 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=b5a20903
remove unused imports
---
gkeys-gen/setup.py | 1 -
gkeys-ldap/setup.py | 1 -
gkeys/gkeys/SaneConfigParser.py | 3 ++-
gkeys/gkeys/base.py | 2 +-
gkeys/gkeys/checks.py | 3 +--
5 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/gkeys-gen/setup.py b/gkeys-gen/setup.py
index e2ac6b3..4e6483e 100755
--- a/gkeys-gen/setup.py
+++ b/gkeys-gen/setup.py
@@ -1,6 +1,5 @@
#!/usr/bin/env python
-import os
import sys
from distutils.core import setup
diff --git a/gkeys-ldap/setup.py b/gkeys-ldap/setup.py
index d4f7d5c..1086cfe 100755
--- a/gkeys-ldap/setup.py
+++ b/gkeys-ldap/setup.py
@@ -1,6 +1,5 @@
#!/usr/bin/env python
-import os
import sys
from distutils.core import setup
diff --git a/gkeys/gkeys/SaneConfigParser.py b/gkeys/gkeys/SaneConfigParser.py
index 0616335..359bdd8 100644
--- a/gkeys/gkeys/SaneConfigParser.py
+++ b/gkeys/gkeys/SaneConfigParser.py
@@ -1,5 +1,6 @@
+#
+#-*- coding:utf-8 -*-
-import sys
try:
from configparser import ConfigParser
diff --git a/gkeys/gkeys/base.py b/gkeys/gkeys/base.py
index 56262df..499c291 100644
--- a/gkeys/gkeys/base.py
+++ b/gkeys/gkeys/base.py
@@ -17,7 +17,7 @@ from __future__ import print_function
import argparse
import sys
-from gkeys import config, fileops, seed, lib
+from gkeys import fileops, seed, lib
from gkeys.log import log_levels, set_logger
diff --git a/gkeys/gkeys/checks.py b/gkeys/gkeys/checks.py
index b66165b..69df9c4 100644
--- a/gkeys/gkeys/checks.py
+++ b/gkeys/gkeys/checks.py
@@ -15,8 +15,7 @@ from collections import namedtuple, OrderedDict
from gkeys.config import GKEY_CHECK
from pyGPG.mappings import (ALGORITHM_CODES, CAPABILITY_MAP,
-KEY_VERSION_FPR_LEN, VALIDITY_MAP, INVALID_LIST,
-VALID_LIST)
+KEY_VERSION_FPR_LEN, VALIDITY_MAP, VALID_LIST)
SPEC_INDEX = {
[gentoo-commits] gentoo-x86 commit in games-arcade/rocksndiamonds/files: rocksndiamonds-3.3.1.2-perms.patch rocksndiamonds-3.3.1.2-parallel-build.patch
mr_bones_14/12/31 21:19:46 Added:rocksndiamonds-3.3.1.2-perms.patch rocksndiamonds-3.3.1.2-parallel-build.patch Log: version bump (bug #533904) (Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit) Revision ChangesPath 1.1 games-arcade/rocksndiamonds/files/rocksndiamonds-3.3.1.2-perms.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/rocksndiamonds/files/rocksndiamonds-3.3.1.2-perms.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/rocksndiamonds/files/rocksndiamonds-3.3.1.2-perms.patch?rev=1.1&content-type=text/plain Index: rocksndiamonds-3.3.1.2-perms.patch === diff -up rocksndiamonds-3.3.0.1/src/libgame/setup.c.CVE-2011-4606 rocksndiamonds-3.3.0.1/src/libgame/setup.c --- rocksndiamonds-3.3.0.1/src/libgame/setup.c.CVE-2011-46062011-12-12 14:28:30.083078680 -0500 +++ rocksndiamonds-3.3.0.1/src/libgame/setup.c 2011-12-12 14:34:36.758744753 -0500 @@ -1293,11 +1293,14 @@ void sortTreeInfo(TreeInfo **node_first) #define MODE_W_ALL (S_IWUSR | S_IWGRP | S_IWOTH) #define MODE_X_ALL (S_IXUSR | S_IXGRP | S_IXOTH) +#define MODE_R_PRIVATE (S_IRUSR) #define MODE_W_PRIVATE (S_IWUSR) +#define MODE_X_PRIVATE (S_IXUSR) + #define MODE_W_PUBLIC (S_IWUSR | S_IWGRP) #define MODE_W_PUBLIC_DIR (S_IWUSR | S_IWGRP | S_ISGID) -#define DIR_PERMS_PRIVATE (MODE_R_ALL | MODE_X_ALL | MODE_W_PRIVATE) +#define DIR_PERMS_PRIVATE (MODE_R_PRIVATE | MODE_X_PRIVATE | MODE_W_PRIVATE) #define DIR_PERMS_PUBLIC (MODE_R_ALL | MODE_X_ALL | MODE_W_PUBLIC_DIR) #define FILE_PERMS_PRIVATE (MODE_R_ALL | MODE_W_PRIVATE) @@ -1456,7 +1459,8 @@ void createDirectory(char *dir, char *te if (running_setgid) posix_umask(last_umask & group_umask); else -dir_mode |= MODE_W_ALL; +if (permission_class == PERMS_PUBLIC) + dir_mode |= MODE_W_ALL; if (!fileExists(dir)) if (posix_mkdir(dir, dir_mode) != 0) 1.1 games-arcade/rocksndiamonds/files/rocksndiamonds-3.3.1.2-parallel-build.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/rocksndiamonds/files/rocksndiamonds-3.3.1.2-parallel-build.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/rocksndiamonds/files/rocksndiamonds-3.3.1.2-parallel-build.patch?rev=1.1&content-type=text/plain Index: rocksndiamonds-3.3.1.2-parallel-build.patch === diff -ru rocksndiamonds-3.3.1.2.orig/src/Makefile rocksndiamonds-3.3.1.2/src/Makefile --- rocksndiamonds-3.3.1.2.orig/src/Makefile2013-11-24 08:05:56.0 -0500 +++ rocksndiamonds-3.3.1.2/src/Makefile 2014-12-31 15:47:37.539941795 -0500 @@ -255,7 +255,7 @@ # build targets # - -all: $(AUTOCONF) libgame_dir game_em_dir game_sp_dir $(PROGNAME) +all: $(PROGNAME) $(PROGNAME): $(RNDLIBS) $(TIMESTAMP_FILE) $(OBJS) $(ICON) $(CC) $(PROFILING) $(OBJS) $(ICON) $(RNDLIBS) $(LDFLAGS) -o $(PROGNAME)
[gentoo-commits] gentoo-x86 commit in games-arcade/rocksndiamonds: rocksndiamonds-3.3.1.2.ebuild ChangeLog
mr_bones_14/12/31 21:19:46
Modified: ChangeLog
Added:rocksndiamonds-3.3.1.2.ebuild
Log:
version bump (bug #533904)
(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Revision ChangesPath
1.46 games-arcade/rocksndiamonds/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/rocksndiamonds/ChangeLog?rev=1.46&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/rocksndiamonds/ChangeLog?rev=1.46&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/rocksndiamonds/ChangeLog?r1=1.45&r2=1.46
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/ChangeLog,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ChangeLog 24 Aug 2012 08:31:56 - 1.45
+++ ChangeLog 31 Dec 2014 21:19:46 - 1.46
@@ -1,6 +1,13 @@
# ChangeLog for games-arcade/rocksndiamonds
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/ChangeLog,v
1.45 2012/08/24 08:31:56 mr_bones_ Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/ChangeLog,v
1.46 2014/12/31 21:19:46 mr_bones_ Exp $
+
+*rocksndiamonds-3.3.1.2 (31 Dec 2014)
+
+ 31 Dec 2014; Michael Sterrett
+ +files/rocksndiamonds-3.3.1.2-parallel-build.patch,
+ +files/rocksndiamonds-3.3.1.2-perms.patch, +rocksndiamonds-3.3.1.2.ebuild:
+ version bump (bug #533904)
24 Aug 2012; Michael Sterrett
rocksndiamonds-3.3.0.1-r1.ebuild:
1.1 games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.ebuild?rev=1.1&content-type=text/plain
Index: rocksndiamonds-3.3.1.2.ebuild
===
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header:
/var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.ebuild,v
1.1 2014/12/31 21:19:46 mr_bones_ Exp $
EAPI=5
inherit flag-o-matic eutils games
DESCRIPTION="A Boulderdash clone"
HOMEPAGE="http://www.artsoft.org/rocksndiamonds/";
SRC_URI="http://www.artsoft.org/RELEASES/unix/rocksndiamonds/${P}.tar.gz
http://www.artsoft.org/RELEASES/rocksndiamonds/levels/Contributions-1.2.0.zip
http://www.artsoft.org/RELEASES/rocksndiamonds/levels/BD2K3-1.0.0.zip
http://www.artsoft.org/RELEASES/rocksndiamonds/levels/Boulder_Dash_Dream-1.0.0.zip
http://www.artsoft.org/RELEASES/rocksndiamonds/levels/rnd-contrib-1.0.0.tar.gz
http://www.artsoft.org/RELEASES/rocksndiamonds/levels/Snake_Bite-1.0.0.zip
http://www.artsoft.org/RELEASES/rocksndiamonds/levels/Sokoban-1.0.0.zip
http://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-emc-1.0.tar.gz
http://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-sp-1.0.tar.gz
http://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-dx-1.0.tar.gz
mirror://gentoo/rnd_jue-v8.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="X sdl"
RDEPEND="X? ( x11-libs/libX11 )
!sdl? ( x11-libs/libX11 )
sdl? (
>=media-libs/libsdl-1.2.3[joystick,video]
>=media-libs/sdl-mixer-1.2.4[mod,mp3,timidity]
media-libs/sdl-net
>=media-libs/sdl-image-1.2.2[gif]
media-libs/smpeg
)"
DEPEND="${RDEPEND}
app-arch/unzip
X? ( x11-libs/libXt )
!sdl? ( x11-libs/libXt )"
src_unpack() {
unpack ${P}.tar.gz
cd "${S}"
unpack \
rockslevels-emc-1.0.tar.gz \
rockslevels-sp-1.0.tar.gz \
rockslevels-dx-1.0.tar.gz
cd levels
unpack \
rnd_jue-v8.tar.bz2 \
BD2K3-1.0.0.zip \
rnd-contrib-1.0.0.tar.gz \
Snake_Bite-1.0.0.zip \
Contributions-1.2.0.zip \
Boulder_Dash_Dream-1.0.0.zip \
Sokoban-1.0.0.zip
}
src_prepare() {
# make it parallel-friendly.
epatch \
"${FILESDIR}"/${P}-parallel-build.patch \
"${FILESDIR}"/${P}-perms.patch
sed -i \
-e 's:\$(MAKE_CMD):$(MAKE) -C $(SRC_DIR):' \
-e '/^MAKE/d' \
-e '/^CC/d' \
Makefile || die
sed -i \
-e '/^LDFLAGS/s/=/+=/' \
src/Makefile || die
}
src_compile() {
[gentoo-commits] gentoo-x86 commit in games-engines/scummvm: ChangeLog scummvm-1.7.0-r2.ebuild scummvm-1.7.0-r1.ebuild
calchan 14/12/31 20:59:53
Modified: ChangeLog
Added:scummvm-1.7.0-r2.ebuild
Removed: scummvm-1.7.0-r1.ebuild
Log:
Fix bug with addition of 'unsupported' USE flag. Thanks to David Turner.
(Portage version: 2.2.15/cvs/Linux x86_64, unsigned Manifest commit)
Revision ChangesPath
1.140games-engines/scummvm/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/scummvm/ChangeLog?rev=1.140&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/scummvm/ChangeLog?rev=1.140&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/scummvm/ChangeLog?r1=1.139&r2=1.140
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/games-engines/scummvm/ChangeLog,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- ChangeLog 30 Dec 2014 19:13:15 - 1.139
+++ ChangeLog 31 Dec 2014 20:59:53 - 1.140
@@ -1,11 +1,17 @@
# ChangeLog for games-engines/scummvm
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/ChangeLog,v 1.139
2014/12/30 19:13:15 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/ChangeLog,v 1.140
2014/12/31 20:59:53 calchan Exp $
+
+*scummvm-1.7.0-r2 (31 Dec 2014)
+
+ 31 Dec 2014; Denis Dupeyron -scummvm-1.7.0-r1.ebuild,
+ +scummvm-1.7.0-r2.ebuild:
+ Fix bug with addition of 'unsupported' USE flag. Thanks to David Turner.
*scummvm-1.7.0-r1 (30 Dec 2014)
- 30 Dec 2014; Denis Dupeyron -scummvm-1.7.0.ebuild,
- +scummvm-1.7.0-r1.ebuild, metadata.xml:
+ 30 Dec 2014; Denis Dupeyron +scummvm-1.7.0-r1.ebuild,
+ metadata.xml:
Remove redundant jpeg flag in IUSE. Add unsupported USE flag to build
unsupported and/or broken game engines, with warning in metadata. Add support
for EXTRA_ECONF.
1.1 games-engines/scummvm/scummvm-1.7.0-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/scummvm/scummvm-1.7.0-r2.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/scummvm/scummvm-1.7.0-r2.ebuild?rev=1.1&content-type=text/plain
Index: scummvm-1.7.0-r2.ebuild
===
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header:
/var/cvsroot/gentoo-x86/games-engines/scummvm/scummvm-1.7.0-r2.ebuild,v 1.1
2014/12/31 20:59:53 calchan Exp $
EAPI=5
inherit eutils flag-o-matic gnome2-utils toolchain-funcs games
DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts
adventures"
HOMEPAGE="http://scummvm.sourceforge.net/";
SRC_URI="mirror://sourceforge/scummvm/${P/_/}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1 BSD GPL-3-with-font-exception"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
IUSE="aac alsa debug flac fluidsynth jpeg mpeg2 mp3 opengl png theora truetype
unsupported vorbis zlib"
RESTRICT="test" # it only looks like there's a test there #77507
RDEPEND=">=media-libs/libsdl-1.2.2[sound,joystick,video]
zlib? ( sys-libs/zlib )
jpeg? ( virtual/jpeg:0 )
png? ( media-libs/libpng:0 )
vorbis? ( media-libs/libogg media-libs/libvorbis )
theora? ( media-libs/libtheora )
aac? ( media-libs/faad2 )
alsa? ( media-libs/alsa-lib )
mp3? ( media-libs/libmad )
mpeg2? ( media-libs/libmpeg2 )
flac? ( media-libs/flac )
opengl? ( virtual/opengl )
truetype? ( media-libs/freetype:2 )
fluidsynth? ( media-sound/fluidsynth )"
DEPEND="${RDEPEND}
x86? ( dev-lang/nasm )"
S=${WORKDIR}/${P/_/}
src_prepare() {
# -g isn't needed for nasm here
sed -i \
-e '/NASMFLAGS/ s/-g//' \
configure || die
sed -i \
-e '/INSTALL.*doc/d' \
-e '/INSTALL.*\/pixmaps/d' \
-e 's/-s //' \
ports.mk || die
}
src_configure() {
local myconf
# bug #137547
use fluidsynth || myconf="${myconf} --disable-fluidsynth"
use x86 && append-ldflags -Wl,-z,noexecstack
# NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF
./configure \
--backend=sdl \
--host=$CHOST \
--enable-verbose-build \
--prefix=/usr \
--bindir="${GAMES_BINDIR}" \
--datadir="${GAMES_DATADIR}"/${PN} \
--libdir="${GAMES_LIBDIR}" \
--enable-zlib \
$(use_enable debug) \
$(use_enable !debug release-mode) \
$(use_enable zlib) \
$(use_enable aac faad) \
$(use_enable alsa) \
$(use_enable jpeg) \
$(use_enable
[gentoo-commits] proj/api:master commit in: files/overlays/
commit: 286c06047434747333d3e3bd565c44387d4b03f0 Author: Sebastian Pipping gentoo org> AuthorDate: Wed Dec 31 20:25:00 2014 + Commit: Sebastian Pipping gentoo org> CommitDate: Wed Dec 31 20:25:00 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/api.git;a=commit;h=286c0604 Add overlay "bobwya" --- files/overlays/repositories.xml | 13 + 1 file changed, 13 insertions(+) diff --git a/files/overlays/repositories.xml b/files/overlays/repositories.xml index 2ee3fa7..22a2c97 100644 --- a/files/overlays/repositories.xml +++ b/files/overlays/repositories.xml @@ -707,6 +707,19 @@ FIN http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=rss +bobwya +Miscellaneous Gentoo ebuilds +https://github.com/bobwya/miscellaneous_ebuilds + + bob.mt@gmail.com + Bob Wya + +https://github.com/bobwya/miscellaneous_ebuilds.git +git://github.com/bobwya/miscellaneous_ebuilds.git +g...@github.com:bobwya/miscellaneous_ebuilds.git + https://github.com/bobwya/miscellaneous_ebuilds/commits/master.atom + + booboo L29Ah personal overlay https://github.com/l29ah/booboo
[gentoo-commits] proj/api:master commit in: files/overlays/
commit: 288d018644634d0128549f8a762db6d0c13b592c Author: Sebastian Pipping gentoo org> AuthorDate: Wed Dec 31 20:07:29 2014 + Commit: Sebastian Pipping gentoo org> CommitDate: Wed Dec 31 20:07:29 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/api.git;a=commit;h=288d0186 Add overlay "posativ" --- files/overlays/repositories.xml | 13 + 1 file changed, 13 insertions(+) diff --git a/files/overlays/repositories.xml b/files/overlays/repositories.xml index f6aa576..548b82b 100644 --- a/files/overlays/repositories.xml +++ b/files/overlays/repositories.xml @@ -4199,6 +4199,19 @@ FIN git://github.com/lnagel/portage-backup.git http://github.com/lnagel/portage-backup/commits/master.atom + +posativ +Overlay of Martin Zimmermann +https://github.com/posativ/overlay + + i...@posativ.org + Martin Zimmermann + +https://github.com/posativ/overlay.git +git://github.com/posativ/overlay.git +g...@github.com:posativ/overlay.git +https://github.com/posativ/overlay/commits/master.atom + postgresql-experimental Development overlay for PostgreSQL, experimental branch.
[gentoo-commits] proj/api:master commit in: files/overlays/
commit: 737289eb6a97854654c7dc10afd12a28b3f86d30 Author: Sebastian Pipping gentoo org> AuthorDate: Wed Dec 31 20:10:33 2014 + Commit: Sebastian Pipping gentoo org> CommitDate: Wed Dec 31 20:10:33 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/api.git;a=commit;h=737289eb Add overlay "qutebrowser" --- files/overlays/repositories.xml | 13 + 1 file changed, 13 insertions(+) diff --git a/files/overlays/repositories.xml b/files/overlays/repositories.xml index 548b82b..2ee3fa7 100644 --- a/files/overlays/repositories.xml +++ b/files/overlays/repositories.xml @@ -4429,6 +4429,19 @@ FIN http://www.startux.de/git/quarks.git http://www.startux.de/gitweb/quarks.git/rss + +qutebrowser +Overlay providing qutebrowser ebuilds +https://github.com/posativ/qutebrowser-overlay + + i...@posativ.org + Martin Zimmermann + +https://github.com/posativ/qutebrowser-overlay.git +git://github.com/posativ/qutebrowser-overlay.git +g...@github.com:posativ/qutebrowser-overlay.git + https://github.com/posativ/qutebrowser-overlay/commits/master.atom + rafaelmartins
[gentoo-commits] gentoo-x86 commit in x11-misc/screen-message: screen-message-0.23.ebuild ChangeLog
sping 14/12/31 19:59:43
Modified: screen-message-0.23.ebuild ChangeLog
Log:
x11-misc/screen-message: Clean-up
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
0x401A1600)
Revision ChangesPath
1.2 x11-misc/screen-message/screen-message-0.23.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/screen-message/screen-message-0.23.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/screen-message/screen-message-0.23.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/screen-message/screen-message-0.23.ebuild?r1=1.1&r2=1.2
Index: screen-message-0.23.ebuild
===
RCS file:
/var/cvsroot/gentoo-x86/x11-misc/screen-message/screen-message-0.23.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- screen-message-0.23.ebuild 31 Dec 2014 19:46:28 - 1.1
+++ screen-message-0.23.ebuild 31 Dec 2014 19:59:43 - 1.2
@@ -1,16 +1,14 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/x11-misc/screen-message/screen-message-0.23.ebuild,v
1.1 2014/12/31 19:46:28 sping Exp $
+# $Header:
/var/cvsroot/gentoo-x86/x11-misc/screen-message/screen-message-0.23.ebuild,v
1.2 2014/12/31 19:59:43 sping Exp $
-EAPI="2"
-
-inherit eutils
+EAPI="5"
DESCRIPTION="Display a multi-line message large, fullscreen, black on white"
HOMEPAGE="http://www.joachim-breitner.de/projects#screen-message";
SRC_URI="mirror://debian/pool/main/s/${PN}/${PN}_${PV}.orig.tar.gz"
-LICENSE="|| ( GPL-2 GPL-3 )"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
@@ -21,7 +19,7 @@
!http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/screen-message/ChangeLog?rev=1.8&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/screen-message/ChangeLog?rev=1.8&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/screen-message/ChangeLog?r1=1.7&r2=1.8
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/x11-misc/screen-message/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ChangeLog 31 Dec 2014 19:46:28 - 1.7
+++ ChangeLog 31 Dec 2014 19:59:43 - 1.8
@@ -1,6 +1,9 @@
# ChangeLog for x11-misc/screen-message
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/screen-message/ChangeLog,v 1.7
2014/12/31 19:46:28 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/screen-message/ChangeLog,v 1.8
2014/12/31 19:59:43 sping Exp $
+
+ 31 Dec 2014; Sebastian Pipping screen-message-0.23.ebuild:
+ Clean-up ebuild
*screen-message-0.23 (31 Dec 2014)
[gentoo-commits] gentoo-x86 commit in x11-misc/screen-message: screen-message-0.23.ebuild ChangeLog
sping 14/12/31 19:46:28
Modified: ChangeLog
Added:screen-message-0.23.ebuild
Log:
x11-misc/screen-message: 0.23
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
0x401A1600)
Revision ChangesPath
1.7 x11-misc/screen-message/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/screen-message/ChangeLog?rev=1.7&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/screen-message/ChangeLog?rev=1.7&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/screen-message/ChangeLog?r1=1.6&r2=1.7
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/x11-misc/screen-message/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ChangeLog 29 May 2014 16:30:21 - 1.6
+++ ChangeLog 31 Dec 2014 19:46:28 - 1.7
@@ -1,6 +1,12 @@
# ChangeLog for x11-misc/screen-message
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/screen-message/ChangeLog,v 1.6
2014/05/29 16:30:21 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/screen-message/ChangeLog,v 1.7
2014/12/31 19:46:28 sping Exp $
+
+*screen-message-0.23 (31 Dec 2014)
+
+ 31 Dec 2014; Sebastian Pipping
+ +screen-message-0.23.ebuild:
+ Bump to 0.23
*screen-message-0.22 (29 May 2014)
1.1 x11-misc/screen-message/screen-message-0.23.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/screen-message/screen-message-0.23.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/screen-message/screen-message-0.23.ebuild?rev=1.1&content-type=text/plain
Index: screen-message-0.23.ebuild
===
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header:
/var/cvsroot/gentoo-x86/x11-misc/screen-message/screen-message-0.23.ebuild,v
1.1 2014/12/31 19:46:28 sping Exp $
EAPI="2"
inherit eutils
DESCRIPTION="Display a multi-line message large, fullscreen, black on white"
HOMEPAGE="http://www.joachim-breitner.de/projects#screen-message";
SRC_URI="mirror://debian/pool/main/s/${PN}/${PN}_${PV}.orig.tar.gz"
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="x11-libs/gtk+:3
>=x11-libs/pango-1.16"
RDEPEND="${DEPEND}
!
[gentoo-commits] gentoo-x86 commit in app-arch/gzip: gzip-1.6.ebuild ChangeLog
ottxor 14/12/31 19:44:40
Modified: gzip-1.6.ebuild ChangeLog
Log:
added prefix support (bug #534032)
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
C2000586)
Revision ChangesPath
1.3 app-arch/gzip/gzip-1.6.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/gzip/gzip-1.6.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/gzip/gzip-1.6.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/gzip/gzip-1.6.ebuild?r1=1.2&r2=1.3
Index: gzip-1.6.ebuild
===
RCS file: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.6.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gzip-1.6.ebuild 18 Jan 2014 01:18:08 - 1.2
+++ gzip-1.6.ebuild 31 Dec 2014 19:44:39 - 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.6.ebuild,v 1.2
2014/01/18 01:18:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.6.ebuild,v 1.3
2014/12/31 19:44:39 ottxor Exp $
EAPI="4"
@@ -14,11 +14,12 @@
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd
~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris
~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="pic static"
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.3.8-install-symlinks.patch
+ epatch "${FILESDIR}"/${PN}-1.4-asmv.patch
}
src_configure() {
@@ -36,5 +37,5 @@
# keep most things in /usr, just the fun stuff in /
dodir /bin
mv "${ED}"/usr/bin/{gunzip,gzip,uncompress,zcat} "${ED}"/bin/ || die
- sed -i -e 's:/usr::' "${ED}"/bin/gunzip || die
+ sed -e "s:${EPREFIX}/usr:${EPREFIX}:" -i "${ED}"/bin/gunzip || die
}
1.125app-arch/gzip/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/gzip/ChangeLog?rev=1.125&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/gzip/ChangeLog?rev=1.125&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/gzip/ChangeLog?r1=1.124&r2=1.125
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/app-arch/gzip/ChangeLog,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- ChangeLog 18 Jan 2014 01:18:08 - 1.124
+++ ChangeLog 31 Dec 2014 19:44:39 - 1.125
@@ -1,6 +1,10 @@
# ChangeLog for app-arch/gzip
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/ChangeLog,v 1.124 2014/01/18
01:18:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/ChangeLog,v 1.125 2014/12/31
19:44:39 ottxor Exp $
+
+ 31 Dec 2014; Christoph Junghans
+ +files/gzip-1.4-asmv.patch, gzip-1.6.ebuild:
+ added prefix support (bug #534032)
18 Jan 2014; Mike Frysinger gzip-1.5.ebuild,
gzip-1.6.ebuild:
[gentoo-commits] gentoo-x86 commit in app-arch/gzip/files: gzip-1.4-asmv.patch
ottxor 14/12/31 19:44:40 Added:gzip-1.4-asmv.patch Log: added prefix support (bug #534032) (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key C2000586) Revision ChangesPath 1.1 app-arch/gzip/files/gzip-1.4-asmv.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/gzip/files/gzip-1.4-asmv.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/gzip/files/gzip-1.4-asmv.patch?rev=1.1&content-type=text/plain Index: gzip-1.4-asmv.patch === http://bugs.gentoo.org/show_bug.cgi?id=302773 --- tailor.h.old2010-01-29 11:13:02.0 + +++ tailor.h2010-01-29 13:18:15.0 + @@ -69,9 +69,6 @@ # include # define OS_CODE 0x00 # define SET_BINARY_MODE(fd) setmode(fd, O_BINARY) -# if !defined(NO_ASM) && !defined(ASMV) -#define ASMV -# endif #else # define near #endif @@ -182,7 +179,6 @@ # define PATH_SEP2 ':' # define STDC_HEADERS # define OS_CODE 0x01 -# define ASMV # ifdef __GNUC__ #define HAVE_DIRENT_H #define HAVE_FCNTL_H @@ -201,7 +197,6 @@ #endif #if defined(ATARI) || defined(atarist) -# define ASMV # define OS_CODE 0x05 # ifdef TOSFS #define PATH_SEP2 '\\'
[gentoo-commits] gentoo-x86 commit in app-arch/lz4: lz4-0_p120.ebuild ChangeLog
ago 14/12/31 19:14:46
Modified: lz4-0_p120.ebuild ChangeLog
Log:
Stable for ppc64, wrt bug #524420
(Portage version: 2.2.14/cvs/Linux x86_64, RepoMan options:
--include-arches="ppc64", signed Manifest commit with key 7194459F)
Revision ChangesPath
1.9 app-arch/lz4/lz4-0_p120.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/lz4/lz4-0_p120.ebuild?rev=1.9&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/lz4/lz4-0_p120.ebuild?rev=1.9&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/lz4/lz4-0_p120.ebuild?r1=1.8&r2=1.9
Index: lz4-0_p120.ebuild
===
RCS file: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-0_p120.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lz4-0_p120.ebuild 31 Dec 2014 19:14:34 - 1.8
+++ lz4-0_p120.ebuild 31 Dec 2014 19:14:46 - 1.9
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-0_p120.ebuild,v 1.8
2014/12/31 19:14:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-0_p120.ebuild,v 1.9
2014/12/31 19:14:46 ago Exp $
EAPI=5
@@ -14,7 +14,7 @@
MY_PV="r${PV##0_p}"
MY_P="${PN}-${MY_PV}"
SRC_URI="https://github.com/Cyan4973/lz4/archive/${MY_PV}.tar.gz ->
${MY_P}.tar.gz"
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64
~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64
~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
S="${WORKDIR}/${MY_P}"
fi
1.36 app-arch/lz4/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/lz4/ChangeLog?rev=1.36&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/lz4/ChangeLog?rev=1.36&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/lz4/ChangeLog?r1=1.35&r2=1.36
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/app-arch/lz4/ChangeLog,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ChangeLog 31 Dec 2014 19:14:34 - 1.35
+++ ChangeLog 31 Dec 2014 19:14:46 - 1.36
@@ -1,6 +1,9 @@
# ChangeLog for app-arch/lz4
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/ChangeLog,v 1.35 2014/12/31
19:14:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/ChangeLog,v 1.36 2014/12/31
19:14:46 ago Exp $
+
+ 31 Dec 2014; Agostino Sarubbo lz4-0_p120.ebuild:
+ Stable for ppc64, wrt bug #524420
31 Dec 2014; Agostino Sarubbo lz4-0_p120.ebuild:
Stable for ppc, wrt bug #524420
[gentoo-commits] gentoo-x86 commit in app-arch/lz4: lz4-0_p120.ebuild ChangeLog
ago 14/12/31 19:14:34
Modified: lz4-0_p120.ebuild ChangeLog
Log:
Stable for ppc, wrt bug #524420
(Portage version: 2.2.14/cvs/Linux x86_64, RepoMan options:
--include-arches="ppc", signed Manifest commit with key 7194459F)
Revision ChangesPath
1.8 app-arch/lz4/lz4-0_p120.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/lz4/lz4-0_p120.ebuild?rev=1.8&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/lz4/lz4-0_p120.ebuild?rev=1.8&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/lz4/lz4-0_p120.ebuild?r1=1.7&r2=1.8
Index: lz4-0_p120.ebuild
===
RCS file: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-0_p120.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- lz4-0_p120.ebuild 16 Dec 2014 20:32:54 - 1.7
+++ lz4-0_p120.ebuild 31 Dec 2014 19:14:34 - 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-0_p120.ebuild,v 1.7
2014/12/16 20:32:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-0_p120.ebuild,v 1.8
2014/12/31 19:14:34 ago Exp $
EAPI=5
@@ -14,7 +14,7 @@
MY_PV="r${PV##0_p}"
MY_P="${PN}-${MY_PV}"
SRC_URI="https://github.com/Cyan4973/lz4/archive/${MY_PV}.tar.gz ->
${MY_P}.tar.gz"
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64
~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
S="${WORKDIR}/${MY_P}"
fi
1.35 app-arch/lz4/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/lz4/ChangeLog?rev=1.35&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/lz4/ChangeLog?rev=1.35&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/lz4/ChangeLog?r1=1.34&r2=1.35
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/app-arch/lz4/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ChangeLog 16 Dec 2014 20:32:54 - 1.34
+++ ChangeLog 31 Dec 2014 19:14:34 - 1.35
@@ -1,6 +1,9 @@
# ChangeLog for app-arch/lz4
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/ChangeLog,v 1.34 2014/12/16
20:32:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/ChangeLog,v 1.35 2014/12/31
19:14:34 ago Exp $
+
+ 31 Dec 2014; Agostino Sarubbo lz4-0_p120.ebuild:
+ Stable for ppc, wrt bug #524420
16 Dec 2014; Markus Meier lz4-0_p120.ebuild:
arm stable, bug #524420
[gentoo-commits] gentoo-x86 commit in sys-apps/systemd: systemd-216-r2.ebuild ChangeLog
ago 14/12/31 19:13:39 Modified: systemd-216-r2.ebuild ChangeLog Log: Stable for x86, wrt bug #525112 (Portage version: 2.2.14/cvs/Linux x86_64, RepoMan options: --include-arches="x86", signed Manifest commit with key 7194459F) Revision ChangesPath 1.5 sys-apps/systemd/systemd-216-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-216-r2.ebuild?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-216-r2.ebuild?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-216-r2.ebuild?r1=1.4&r2=1.5 Index: systemd-216-r2.ebuild === RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-216-r2.ebuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- systemd-216-r2.ebuild 31 Dec 2014 19:13:25 - 1.4 +++ systemd-216-r2.ebuild 31 Dec 2014 19:13:39 - 1.5 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-216-r2.ebuild,v 1.4 2014/12/31 19:13:25 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-216-r2.ebuild,v 1.5 2014/12/31 19:13:39 ago Exp $ EAPI=5 @@ -16,7 +16,7 @@ LICENSE="GPL-2 LGPL-2.1 MIT public-domain" SLOT="0/2" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86" IUSE="acl apparmor audit cryptsetup curl doc elfutils +firmware-loader gcrypt gudev http idn introspection kdbus +kmod lz4 lzma pam policykit python qrcode +seccomp selinux ssl sysv-utils test vanilla" 1.334sys-apps/systemd/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.334&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.334&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.333&r2=1.334 Index: ChangeLog === RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v retrieving revision 1.333 retrieving revision 1.334 diff -u -r1.333 -r1.334 --- ChangeLog 31 Dec 2014 19:13:25 - 1.333 +++ ChangeLog 31 Dec 2014 19:13:39 - 1.334 @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/systemd # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.333 2014/12/31 19:13:25 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.334 2014/12/31 19:13:39 ago Exp $ + + 31 Dec 2014; Agostino Sarubbo systemd-216-r2.ebuild: + Stable for x86, wrt bug #525112 31 Dec 2014; Agostino Sarubbo systemd-216-r2.ebuild: Stable for amd64, wrt bug #525112
[gentoo-commits] gentoo-x86 commit in sys-apps/systemd: systemd-216-r2.ebuild ChangeLog
ago 14/12/31 19:13:25 Modified: systemd-216-r2.ebuild ChangeLog Log: Stable for amd64, wrt bug #525112 (Portage version: 2.2.14/cvs/Linux x86_64, RepoMan options: --include-arches="amd64", signed Manifest commit with key 7194459F) Revision ChangesPath 1.4 sys-apps/systemd/systemd-216-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-216-r2.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-216-r2.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-216-r2.ebuild?r1=1.3&r2=1.4 Index: systemd-216-r2.ebuild === RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-216-r2.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- systemd-216-r2.ebuild 20 Dec 2014 08:25:20 - 1.3 +++ systemd-216-r2.ebuild 31 Dec 2014 19:13:25 - 1.4 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-216-r2.ebuild,v 1.3 2014/12/20 08:25:20 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-216-r2.ebuild,v 1.4 2014/12/31 19:13:25 ago Exp $ EAPI=5 @@ -16,7 +16,7 @@ LICENSE="GPL-2 LGPL-2.1 MIT public-domain" SLOT="0/2" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="acl apparmor audit cryptsetup curl doc elfutils +firmware-loader gcrypt gudev http idn introspection kdbus +kmod lz4 lzma pam policykit python qrcode +seccomp selinux ssl sysv-utils test vanilla" 1.333sys-apps/systemd/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.333&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.333&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.332&r2=1.333 Index: ChangeLog === RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v retrieving revision 1.332 retrieving revision 1.333 diff -u -r1.332 -r1.333 --- ChangeLog 30 Dec 2014 10:54:39 - 1.332 +++ ChangeLog 31 Dec 2014 19:13:25 - 1.333 @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/systemd # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.332 2014/12/30 10:54:39 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.333 2014/12/31 19:13:25 ago Exp $ + + 31 Dec 2014; Agostino Sarubbo systemd-216-r2.ebuild: + Stable for amd64, wrt bug #525112 30 Dec 2014; Pacho Ramos -systemd-216-r1.ebuild, -systemd-217-r3.ebuild, -systemd-218.ebuild:
[gentoo-commits] gentoo-x86 commit in sys-apps/systemd-sysv-utils: systemd-sysv-utils-215.ebuild ChangeLog
ago 14/12/31 19:11:47 Modified: systemd-sysv-utils-215.ebuild ChangeLog Log: Stable for ia64/ppc64/sparc, wrt bug #520036 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 7194459F) Revision ChangesPath 1.7 sys-apps/systemd-sysv-utils/systemd-sysv-utils-215.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd-sysv-utils/systemd-sysv-utils-215.ebuild?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd-sysv-utils/systemd-sysv-utils-215.ebuild?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd-sysv-utils/systemd-sysv-utils-215.ebuild?r1=1.6&r2=1.7 Index: systemd-sysv-utils-215.ebuild === RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd-sysv-utils/systemd-sysv-utils-215.ebuild,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- systemd-sysv-utils-215.ebuild 31 Dec 2014 15:54:04 - 1.6 +++ systemd-sysv-utils-215.ebuild 31 Dec 2014 19:11:47 - 1.7 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd-sysv-utils/systemd-sysv-utils-215.ebuild,v 1.6 2014/12/31 15:54:04 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd-sysv-utils/systemd-sysv-utils-215.ebuild,v 1.7 2014/12/31 19:11:47 ago Exp $ EAPI=5 @@ -12,7 +12,7 @@ LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm ~ia64 ppc ~ppc64 ~sparc x86" +KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86" IUSE="" # new enough util-linux to have tools that were provided by sysvinit 1.16 sys-apps/systemd-sysv-utils/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd-sysv-utils/ChangeLog?rev=1.16&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd-sysv-utils/ChangeLog?rev=1.16&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd-sysv-utils/ChangeLog?r1=1.15&r2=1.16 Index: ChangeLog === RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd-sysv-utils/ChangeLog,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ChangeLog 31 Dec 2014 15:54:04 - 1.15 +++ ChangeLog 31 Dec 2014 19:11:47 - 1.16 @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/systemd-sysv-utils # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd-sysv-utils/ChangeLog,v 1.15 2014/12/31 15:54:04 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd-sysv-utils/ChangeLog,v 1.16 2014/12/31 19:11:47 ago Exp $ + + 31 Dec 2014; Agostino Sarubbo systemd-sysv-utils-215.ebuild: + Stable for ia64/ppc64/sparc, wrt bug #520036 31 Dec 2014; Agostino Sarubbo systemd-sysv-utils-215.ebuild: Stable for ppc, wrt bug #520036
[gentoo-commits] proj/kde:master commit in: virtual/notification-daemon/
commit: eae207d6f9f34c0071cac1f7f13e073dd777f2a1 Author: Alexey Shvetsov gentoo org> AuthorDate: Wed Dec 31 18:53:30 2014 + Commit: Alexey Shvetsov gentoo org> CommitDate: Wed Dec 31 18:53:30 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=eae207d6 [virtual/notification-daemon] Add updated virtual for notification-daemon Package-Manager: portage-2.2.15 --- virtual/notification-daemon/metadata.xml | 8 ++ .../notification-daemon-0.ebuild | 31 ++ 2 files changed, 39 insertions(+) diff --git a/virtual/notification-daemon/metadata.xml b/virtual/notification-daemon/metadata.xml new file mode 100644 index 000..9879e83 --- /dev/null +++ b/virtual/notification-daemon/metadata.xml @@ -0,0 +1,8 @@ + +http://www.gentoo.org/dtd/metadata.dtd";> + + freedesktop + +freedesktop-b...@gentoo.org + + diff --git a/virtual/notification-daemon/notification-daemon-0.ebuild b/virtual/notification-daemon/notification-daemon-0.ebuild new file mode 100644 index 000..690063e --- /dev/null +++ b/virtual/notification-daemon/notification-daemon-0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/virtual/notification-daemon/notification-daemon-0.ebuild,v 1.14 2014/11/08 15:44:09 jauhien Exp $ + +EAPI=5 + +DESCRIPTION="Virtual for notification daemon dbus service" +HOMEPAGE="" +SRC_URI="" + +LICENSE="" +SLOT="0" +KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +IUSE="gnome" + +RDEPEND=" + gnome? ( || ( x11-misc/notification-daemon + gnome-base/gnome-shell ) ) + !gnome? ( || ( x11-misc/notification-daemon + xfce-extra/xfce4-notifyd + x11-misc/qtnotifydaemon + x11-misc/notify-osd + x11-misc/dunst + >=x11-wm/awesome-3.4.4 + x11-wm/enlightenment[enlightenment_modules_notification] + x11-wm/enlightenment[e_modules_notification] + kde-base/knotify + kde-apps/knotify + x11-misc/mate-notification-daemon + lxqt-base/lxqt-notificationd ) )" +DEPEND=""
[gentoo-commits] gentoo-x86 commit in dev-perl/Types-Serialiser: Types-Serialiser-1.0.0.ebuild ChangeLog
zlogene 14/12/31 18:34:24 Modified: Types-Serialiser-1.0.0.ebuild ChangeLog Log: Add more keywords wrt bug #523298 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xC42EB5D6) Revision ChangesPath 1.3 dev-perl/Types-Serialiser/Types-Serialiser-1.0.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/Types-Serialiser/Types-Serialiser-1.0.0.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/Types-Serialiser/Types-Serialiser-1.0.0.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/Types-Serialiser/Types-Serialiser-1.0.0.ebuild?r1=1.2&r2=1.3 Index: Types-Serialiser-1.0.0.ebuild === RCS file: /var/cvsroot/gentoo-x86/dev-perl/Types-Serialiser/Types-Serialiser-1.0.0.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Types-Serialiser-1.0.0.ebuild 11 Nov 2014 20:49:29 - 1.2 +++ Types-Serialiser-1.0.0.ebuild 31 Dec 2014 18:34:24 - 1.3 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/Types-Serialiser/Types-Serialiser-1.0.0.ebuild,v 1.2 2014/11/11 20:49:29 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/Types-Serialiser/Types-Serialiser-1.0.0.ebuild,v 1.3 2014/12/31 18:34:24 zlogene Exp $ EAPI=5 @@ -11,7 +11,7 @@ DESCRIPTION="simple data types for common serialisation formats" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos ~x86-solaris" IUSE="" RDEPEND=" 1.3 dev-perl/Types-Serialiser/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/Types-Serialiser/ChangeLog?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/Types-Serialiser/ChangeLog?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/Types-Serialiser/ChangeLog?r1=1.2&r2=1.3 Index: ChangeLog === RCS file: /var/cvsroot/gentoo-x86/dev-perl/Types-Serialiser/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ChangeLog 11 Nov 2014 20:49:29 - 1.2 +++ ChangeLog 31 Dec 2014 18:34:24 - 1.3 @@ -1,6 +1,9 @@ # ChangeLog for dev-perl/Types-Serialiser # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/Types-Serialiser/ChangeLog,v 1.2 2014/11/11 20:49:29 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/Types-Serialiser/ChangeLog,v 1.3 2014/12/31 18:34:24 zlogene Exp $ + + 31 Dec 2014; Mikle Kolyada Types-Serialiser-1.0.0.ebuild: + Add more keywords wrt bug #523298 11 Nov 2014; Markus Meier Types-Serialiser-1.0.0.ebuild: add ~arm, bug #523298 @@ -10,4 +13,3 @@ 25 Oct 2014; Andreas K. Huettel +Types-Serialiser-1.0.0.ebuild, +metadata.xml: New package -
[gentoo-commits] gentoo-x86 commit in dev-perl/JSON-XS: JSON-XS-3.10.0.ebuild ChangeLog
zlogene 14/12/31 18:33:42 Modified: JSON-XS-3.10.0.ebuild ChangeLog Log: Add more keywords wrt bug #523298 (Portage version: 2.2.14/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0xC42EB5D6) Revision ChangesPath 1.3 dev-perl/JSON-XS/JSON-XS-3.10.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/JSON-XS/JSON-XS-3.10.0.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/JSON-XS/JSON-XS-3.10.0.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/JSON-XS/JSON-XS-3.10.0.ebuild?r1=1.2&r2=1.3 Index: JSON-XS-3.10.0.ebuild === RCS file: /var/cvsroot/gentoo-x86/dev-perl/JSON-XS/JSON-XS-3.10.0.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- JSON-XS-3.10.0.ebuild 11 Nov 2014 20:50:15 - 1.2 +++ JSON-XS-3.10.0.ebuild 31 Dec 2014 18:33:41 - 1.3 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/JSON-XS/JSON-XS-3.10.0.ebuild,v 1.2 2014/11/11 20:50:15 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/JSON-XS/JSON-XS-3.10.0.ebuild,v 1.3 2014/12/31 18:33:41 zlogene Exp $ EAPI=5 @@ -11,7 +11,7 @@ DESCRIPTION="JSON::XS - JSON serialising/deserialising, done correctly and fast" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos ~x86-solaris" IUSE="test" RDEPEND=" 1.45 dev-perl/JSON-XS/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/JSON-XS/ChangeLog?rev=1.45&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/JSON-XS/ChangeLog?rev=1.45&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/JSON-XS/ChangeLog?r1=1.44&r2=1.45 Index: ChangeLog === RCS file: /var/cvsroot/gentoo-x86/dev-perl/JSON-XS/ChangeLog,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- ChangeLog 11 Nov 2014 20:50:15 - 1.44 +++ ChangeLog 31 Dec 2014 18:33:41 - 1.45 @@ -1,6 +1,9 @@ # ChangeLog for dev-perl/JSON-XS # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/JSON-XS/ChangeLog,v 1.44 2014/11/11 20:50:15 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/JSON-XS/ChangeLog,v 1.45 2014/12/31 18:33:41 zlogene Exp $ + + 31 Dec 2014; Mikle Kolyada JSON-XS-3.10.0.ebuild: + Add more keywords wrt bug #523298 11 Nov 2014; Markus Meier JSON-XS-3.10.0.ebuild: add ~arm, bug #523298
[gentoo-commits] gentoo-x86 commit in app-crypt/gnupg/files: gnupg-2.0.26-misc-cve.patch gnupg-2.1.1-misc-cve.patch
alonbl 14/12/31 18:27:16
Added:gnupg-2.0.26-misc-cve.patch
gnupg-2.1.1-misc-cve.patch
Log:
Fix misc CVEs, bug#534110
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
BF20DC51)
Revision ChangesPath
1.1 app-crypt/gnupg/files/gnupg-2.0.26-misc-cve.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/gnupg/files/gnupg-2.0.26-misc-cve.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/gnupg/files/gnupg-2.0.26-misc-cve.patch?rev=1.1&content-type=text/plain
Index: gnupg-2.0.26-misc-cve.patch
===
>From ed8383c618e124cfa708c9ee87563fcdf2f4649c Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor
Date: Fri, 19 Dec 2014 18:53:34 -0500
Subject: [PATCH] sm: Avoid double-free on iconv failure
* sm/minip12.c: (p12_build) if jnlib_iconv_open fails, avoid
double-free of pwbuf.
--
Observed by Joshua Rogers , who proposed a
slightly different fix.
Debian-Bug-Id: 773472
Added fix at a second place - wk.
---
sm/minip12.c |2 ++
1 file changed, 2 insertions(+)
diff --git a/agent/minip12.c b/agent/minip12.c
index 01b91b7..ca4d248 100644
--- a/agent/minip12.c
+++ b/agent/minip12.c
@@ -2422,6 +2422,7 @@ p12_build (gcry_mpi_t *kparms, const void *cert, size_t
certlen,
" requested charset '%s': %s\n",
charset, strerror (errno));
gcry_free (pwbuf);
+ pwbuf = NULL;
goto failure;
}
@@ -2436,6 +2437,7 @@ p12_build (gcry_mpi_t *kparms, const void *cert, size_t
certlen,
" requested charset '%s': %s\n",
charset, strerror (errno));
gcry_free (pwbuf);
+ pwbuf = NULL;
jnlib_iconv_close (cd);
goto failure;
}
--
1.7.10.4
>From b0b3803e8c2959dd67ca96debc54b5c6464f0d41 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor
Date: Fri, 19 Dec 2014 18:07:55 -0500
Subject: [PATCH] scd: Avoid double-free on error condition in scd
* scd/command.c (cmd_readkey): avoid double-free of cert
--
When ksba_cert_new() fails, cert will be double-freed.
Debian-Bug-Id: 773471
Original patch changed by wk to do the free only at leave.
---
scd/command.c |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/scd/command.c b/scd/command.c
index dd4191f..1cc580a 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -804,10 +804,8 @@ cmd_readkey (assuan_context_t ctx, char *line)
rc = ksba_cert_new (&kc);
if (rc)
-{
- xfree (cert);
- goto leave;
-}
+goto leave;
+
rc = ksba_cert_init_from_mem (kc, cert, ncert);
if (rc)
{
--
1.7.10.4
>From abd5f6752d693b7f313c19604f0723ecec4d39a6 Mon Sep 17 00:00:00 2001
From: Werner Koch
Date: Mon, 22 Dec 2014 12:16:46 +0100
Subject: [PATCH] dirmngr,gpgsm: Return NULL on fail
* dirmngr/ldapserver.c (ldapserver_parse_one): Set SERVER to NULL.
* sm/gpgsm.c (parse_keyserver_line): Ditto.
--
Reported-by: Joshua Rogers
"If something inside the ldapserver_parse_one function failed,
'server' would be freed, then returned, leading to a
use-after-free. This code is likely copied from sm/gpgsm.c, which
was also susceptible to this bug."
Signed-off-by: Werner Koch
---
dirmngr/ldapserver.c |1 +
sm/gpgsm.c |1 +
2 files changed, 2 insertions(+)
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 3398d17..72bceb4 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -862,6 +862,7 @@ parse_keyserver_line (char *line,
{
log_info (_("%s:%u: skipping this line\n"), filename, lineno);
keyserver_list_free (server);
+ server = NULL;
}
return server;
--
1.7.10.4
1.1 app-crypt/gnupg/files/gnupg-2.1.1-misc-cve.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/gnupg/files/gnupg-2.1.1-misc-cve.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/gnupg/files/gnupg-2.1.1-misc-cve.patch?rev=1.1&content-type=text/plain
Index: gnupg-2.1.1-misc-cve.patch
===
>From ed8383c618e124cfa708c9ee87563fcdf2f4649c Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor
Date: Fri, 19 Dec 2014 18:53:34 -0500
Subject: [PATCH] sm: Avoid double-free on iconv failure
* sm/minip12.c: (p12_build) if jnlib_iconv_open fails, avoid
double-free of pwbuf.
--
Observed by Joshua Rogers , who proposed a
slightly different fix.
Debian-Bug-Id: 773472
Added fix at a second place - wk.
---
sm/minip12.c |2 ++
1 file changed, 2 insertions(+)
diff --git a/sm/minip12.c b/sm/minip12.c
index 01b91b7..ca4d248 100644
--- a/sm/minip12.c
+++ b/sm/minip12.c
@@ -2422,6 +2422,7 @@ p12_build (gcry_mpi_t *kparms, const void *cert, size_t
certlen,
" requested charset '%s': %s\n",
[gentoo-commits] gentoo-x86 commit in app-crypt/gnupg: gnupg-2.1.1-r1.ebuild gnupg-2.0.26-r3.ebuild ChangeLog gnupg-2.1.1.ebuild
alonbl 14/12/31 18:27:16
Modified: ChangeLog
Added:gnupg-2.1.1-r1.ebuild gnupg-2.0.26-r3.ebuild
Removed: gnupg-2.1.1.ebuild
Log:
Fix misc CVEs, bug#534110
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
BF20DC51)
Revision ChangesPath
1.562app-crypt/gnupg/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/gnupg/ChangeLog?rev=1.562&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/gnupg/ChangeLog?rev=1.562&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/gnupg/ChangeLog?r1=1.561&r2=1.562
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v
retrieving revision 1.561
retrieving revision 1.562
diff -u -r1.561 -r1.562
--- ChangeLog 17 Dec 2014 19:05:55 - 1.561
+++ ChangeLog 31 Dec 2014 18:27:16 - 1.562
@@ -1,6 +1,14 @@
# ChangeLog for app-crypt/gnupg
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.561
2014/12/17 19:05:55 k_f Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.562
2014/12/31 18:27:16 alonbl Exp $
+
+*gnupg-2.0.26-r3 (31 Dec 2014)
+*gnupg-2.1.1-r1 (31 Dec 2014)
+
+ 31 Dec 2014; Alon Bar-Lev
+ +files/gnupg-2.0.26-misc-cve.patch, +files/gnupg-2.1.1-misc-cve.patch,
+ +gnupg-2.0.26-r3.ebuild, +gnupg-2.1.1-r1.ebuild, -gnupg-2.1.1.ebuild:
+ Fix misc CVEs, bug#534110
*gnupg-2.1.1 (17 Dec 2014)
1.1 app-crypt/gnupg/gnupg-2.1.1-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/gnupg/gnupg-2.1.1-r1.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/gnupg/gnupg-2.1.1-r1.ebuild?rev=1.1&content-type=text/plain
Index: gnupg-2.1.1-r1.ebuild
===
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.1.1-r1.ebuild,v 1.1
2014/12/31 18:27:16 alonbl Exp $
EAPI="5"
inherit eutils flag-o-matic toolchain-funcs
DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
HOMEPAGE="http://www.gnupg.org/";
MY_P="${P/_/-}"
SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS=""
IUSE="bzip2 doc +gnutls ldap nls readline static selinux smartcard tools usb"
COMMON_DEPEND_LIBS="
dev-libs/npth
>=dev-libs/libassuan-2
>=dev-libs/libgcrypt-1.6.2
>=dev-libs/libgpg-error-1.17
>=dev-libs/libksba-1.0.7
>=net-misc/curl-7.10
gnutls? ( >=net-libs/gnutls-3.0 )
sys-libs/zlib
ldap? ( net-nds/openldap )
bzip2? ( app-arch/bzip2 )
readline? ( sys-libs/readline )
smartcard? ( usb? ( virtual/libusb:0 ) )
"
COMMON_DEPEND_BINS="|| ( app-crypt/pinentry app-crypt/pinentry-qt )"
# Existence of executables is checked during configuration.
DEPEND="${COMMON_DEPEND_LIBS}
${COMMON_DEPEND_BINS}
static? (
>=dev-libs/libassuan-2[static-libs]
>=dev-libs/libgcrypt-1.6.2[static-libs]
>=dev-libs/libgpg-error-1.17[static-libs]
>=dev-libs/libksba-1.0.7[static-libs]
dev-libs/npth[static-libs]
>=net-misc/curl-7.10[static-libs]
sys-libs/zlib[static-libs]
bzip2? ( app-arch/bzip2[static-libs] )
)
nls? ( sys-devel/gettext )
doc? ( sys-apps/texinfo )"
RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
${COMMON_DEPEND_BINS}
selinux? ( sec-policy/selinux-gpg )
nls? ( virtual/libintl )"
REQUIRED_USE="smartcard? ( !static )"
S="${WORKDIR}/${MY_P}"
src_prepare() {
epatch "${FILESDIR}/${PN}-2.0.17-gpgsm-gencert.patch"
epatch "${FILESDIR}/${P}-misc-cve.patch"
epatch_user
}
src_configure() {
local myconf=()
# 'USE=static' support was requested:
# gnupg1: bug #29299
# gnupg2: bug #159623
use static && append-ldflags -static
if use smartcard; then
myconf+=(
--enable-scdaemon
$(use_enable usb ccid-driver)
)
else
myconf+=( --disable-scdaemon )
fi
if use elibc_SunOS || use elibc_AIX; then
myconf+=( --disable-symcryptrun )
else
myconf+=( --enable-symcryptrun )
fi
econf \
--docdir="${EPREFIX}/usr/share/doc/${PF}" \
--enable-gpg \
--enable-gpgsm \
--enable-agent \
--without-adns \
"${myconf[@]}" \
$(use_enable bzi
[gentoo-commits] proj/hardened-dev:musl commit in: net-misc/openssh/files/, net-misc/openssh/
commit: 10c887587f0221a5ecd59b10fdc37f717629da74
Author: Anthony G. Basile gentoo org>
AuthorDate: Wed Dec 31 18:23:51 2014 +
Commit: Anthony G. Basile gentoo org>
CommitDate: Wed Dec 31 18:23:51 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=10c88758
net-misc/openssh: makre 6.7_p1 stable on all arches
Package-Manager: portage-2.2.14
Manifest-Sign-Key: 0xF52D4BBA
---
.../openssh-5.9_p1-sshd-gssapi-multihomed.patch| 184
.../openssh/files/openssh-6.4p1-avoid-exit.patch | 499 -
.../files/openssh-6.5_p1-hpn-cipher-align.patch| 114 -
.../openssh-6.6.1_p1-x509-hpn14v4-glue-p2.patch| 26 --
net-misc/openssh/files/openssh-6.6.1_p1.patch | 167 ---
.../openssh-6.6_p1-openssl-ignore-status.patch | 17 -
.../openssh/files/openssh-6.6_p1-x509-glue.patch | 16 -
.../openssh-6.6_p1-x509-hpn14v4-glue-p2.patch | 26 --
net-misc/openssh/metadata.xml | 1 +
net-misc/openssh/openssh-6.6.1_p1-r99.ebuild | 323 -
net-misc/openssh/openssh-6.6_p1-r99.ebuild | 320 -
net-misc/openssh/openssh-6.7_p1-r99.ebuild | 2 +-
12 files changed, 2 insertions(+), 1693 deletions(-)
diff --git a/net-misc/openssh/files/openssh-5.9_p1-sshd-gssapi-multihomed.patch
b/net-misc/openssh/files/openssh-5.9_p1-sshd-gssapi-multihomed.patch
deleted file mode 100644
index 6377d03..000
--- a/net-misc/openssh/files/openssh-5.9_p1-sshd-gssapi-multihomed.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-Index: gss-serv.c
-===
-RCS file: /cvs/src/usr.bin/ssh/gss-serv.c,v
-retrieving revision 1.22
-diff -u -p -r1.22 gss-serv.c
gss-serv.c 8 May 2008 12:02:23 - 1.22
-+++ gss-serv.c 11 Jan 2010 05:38:29 -
-@@ -41,9 +41,12 @@
- #include "channels.h"
- #include "session.h"
- #include "misc.h"
-+#include "servconf.h"
-
- #include "ssh-gss.h"
-
-+extern ServerOptions options;
-+
- static ssh_gssapi_client gssapi_client =
- { GSS_C_EMPTY_BUFFER, GSS_C_EMPTY_BUFFER,
- GSS_C_NO_CREDENTIAL, NULL, {NULL, NULL, NULL}};
-@@ -77,25 +80,32 @@ ssh_gssapi_acquire_cred(Gssctxt *ctx)
- char lname[MAXHOSTNAMELEN];
- gss_OID_set oidset;
-
-- gss_create_empty_oid_set(&status, &oidset);
-- gss_add_oid_set_member(&status, ctx->oid, &oidset);
--
-- if (gethostname(lname, MAXHOSTNAMELEN)) {
-- gss_release_oid_set(&status, &oidset);
-- return (-1);
-- }
-+ if (options.gss_strict_acceptor) {
-+ gss_create_empty_oid_set(&status, &oidset);
-+ gss_add_oid_set_member(&status, ctx->oid, &oidset);
-+
-+ if (gethostname(lname, MAXHOSTNAMELEN)) {
-+ gss_release_oid_set(&status, &oidset);
-+ return (-1);
-+ }
-+
-+ if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) {
-+ gss_release_oid_set(&status, &oidset);
-+ return (ctx->major);
-+ }
-+
-+ if ((ctx->major = gss_acquire_cred(&ctx->minor,
-+ ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds,
-+ NULL, NULL)))
-+ ssh_gssapi_error(ctx);
-
-- if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) {
- gss_release_oid_set(&status, &oidset);
- return (ctx->major);
-+ } else {
-+ ctx->name = GSS_C_NO_NAME;
-+ ctx->creds = GSS_C_NO_CREDENTIAL;
- }
--
-- if ((ctx->major = gss_acquire_cred(&ctx->minor,
-- ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, NULL, NULL)))
-- ssh_gssapi_error(ctx);
--
-- gss_release_oid_set(&status, &oidset);
-- return (ctx->major);
-+ return GSS_S_COMPLETE;
- }
-
- /* Privileged */
-Index: servconf.c
-===
-RCS file: /cvs/src/usr.bin/ssh/servconf.c,v
-retrieving revision 1.201
-diff -u -p -r1.201 servconf.c
servconf.c 10 Jan 2010 03:51:17 - 1.201
-+++ servconf.c 11 Jan 2010 05:34:56 -
-@@ -86,6 +86,7 @@ initialize_server_options(ServerOptions
- options->kerberos_get_afs_token = -1;
- options->gss_authentication=-1;
- options->gss_cleanup_creds = -1;
-+ options->gss_strict_acceptor = -1;
- options->password_authentication = -1;
- options->kbd_interactive_authentication = -1;
- options->challenge_response_authentication = -1;
-@@ -200,6 +201,8 @@ fill_default_server_options(ServerOption
- options->gss_authentication = 0;
- if (options->gss_cleanup_creds == -1)
- options->gss_cleanup_creds = 1;
-+ if (options->gss_strict_acceptor == -1)
-+ options->gss_strict_acceptor = 0;
- if (options->password_authentication == -1)
- options->password_authenticatio
[gentoo-commits] gentoo-x86 commit in dev-python/wxpython: wxpython-3.0.2.0.ebuild ChangeLog
floppym 14/12/31 17:38:10
Modified: ChangeLog
Added:wxpython-3.0.2.0.ebuild
Log:
Version bump, bug 532016.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
0BBEEA1FEA4843A4)
Revision ChangesPath
1.209dev-python/wxpython/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/wxpython/ChangeLog?rev=1.209&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/wxpython/ChangeLog?rev=1.209&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/wxpython/ChangeLog?r1=1.208&r2=1.209
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- ChangeLog 6 Oct 2014 01:09:03 - 1.208
+++ ChangeLog 31 Dec 2014 17:38:10 - 1.209
@@ -1,6 +1,11 @@
# ChangeLog for dev-python/wxpython
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.208
2014/10/06 01:09:03 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.209
2014/12/31 17:38:10 floppym Exp $
+
+*wxpython-3.0.2.0 (31 Dec 2014)
+
+ 31 Dec 2014; Mike Gilbert +wxpython-3.0.2.0.ebuild:
+ Version bump, bug 532016.
*wxpython-3.0.1.1 (06 Oct 2014)
1.1 dev-python/wxpython/wxpython-3.0.2.0.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/wxpython/wxpython-3.0.2.0.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/wxpython/wxpython-3.0.2.0.ebuild?rev=1.1&content-type=text/plain
Index: wxpython-3.0.2.0.ebuild
===
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header:
/var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-3.0.2.0.ebuild,v 1.1
2014/12/31 17:38:10 floppym Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
WX_GTK_VER="3.0"
inherit alternatives distutils-r1 eutils fdo-mime flag-o-matic wxwidgets
MY_PN="wxPython-src"
DESCRIPTION="A blending of the wxWindows C++ class library with Python"
HOMEPAGE="http://www.wxpython.org/";
SRC_URI="
mirror://sourceforge/wxpython/${MY_PN}-${PV}.tar.bz2
examples? ( mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.bz2 )"
LICENSE="wxWinLL-3"
SLOT="3.0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="cairo examples libnotify opengl"
RDEPEND="
dev-lang/python-exec:2[${PYTHON_USEDEP}]
>=x11-libs/wxGTK-${PV}:${WX_GTK_VER}=[libnotify=,opengl?,tiff,X]
dev-libs/glib:2
dev-python/setuptools[${PYTHON_USEDEP}]
media-libs/libpng:0=
media-libs/tiff:0
virtual/jpeg
x11-libs/gtk+:2
x11-libs/pango[X]
cairo? ( >=dev-python/pycairo-1.8.4[${PYTHON_USEDEP}] )
opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
S="${WORKDIR}/${MY_PN}-${PV}/wxPython"
DOC_S="${WORKDIR}/wxPython-${PV}"
# The hacky build system seems to be broken with out-of-source builds,
# and installs 'wx' package globally.
DISTUTILS_IN_SOURCE_BUILD=1
python_prepare_all() {
sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed"
if use examples; then
cd "${DOC_S}"
epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch
fi
cd "${S}"
local PATCHES=(
"${FILESDIR}"/${PN}-3.0.0.0-wxversion-scripts.patch
# drop editra - we have it as a separate package now
"${FILESDIR}"/${PN}-2.8.11-drop-editra.patch
"${FILESDIR}"/${PN}-2.8-no-preservatives-added.patch
# fix handling egg_info command
"${FILESDIR}"/${PN}-2.8.12.1-disable-egging-mode.patch
)
distutils-r1_python_prepare_all
}
src_configure() {
need-wxwidgets unicode
mydistutilsargs=(
WX_CONFIG="${WX_CONFIG}"
WXPORT=gtk2
UNICODE=1
BUILD_GLCANVAS=$(usex opengl 1 0)
)
}
python_compile() {
# We need to have separate libdirs due to hackery, bug #455332.
distutils-r1_python_compile \
build --build-purelib "${BUILD_DIR}"/lib.common
}
python_install() {
distutils-r1_python_install \
build --build-purelib "${BUILD_DIR}"/lib.common
# adjust the filenames for wxPython slots.
local file
for file in "${D}$(python_get_sitedir)"/wx{version.*,.pth}; do
mv "${file}" "${file}-${SLOT}" || die
done
cd "${ED}"usr/lib/python-exec/"${EPYTHON}" || die
for file in *; do
[gentoo-commits] gentoo-x86 commit in x11-libs/wxGTK: wxGTK-3.0.2.0.ebuild ChangeLog
floppym 14/12/31 17:37:50
Modified: ChangeLog
Added:wxGTK-3.0.2.0.ebuild
Log:
Version bump, bug 532016.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
0BBEEA1FEA4843A4)
Revision ChangesPath
1.316x11-libs/wxGTK/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/ChangeLog?rev=1.316&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/ChangeLog?rev=1.316&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/ChangeLog?r1=1.315&r2=1.316
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -r1.315 -r1.316
--- ChangeLog 6 Oct 2014 01:06:16 - 1.315
+++ ChangeLog 31 Dec 2014 17:37:49 - 1.316
@@ -1,6 +1,11 @@
# ChangeLog for x11-libs/wxGTK
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.315 2014/10/06
01:06:16 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.316 2014/12/31
17:37:49 floppym Exp $
+
+*wxGTK-3.0.2.0 (31 Dec 2014)
+
+ 31 Dec 2014; Mike Gilbert +wxGTK-3.0.2.0.ebuild:
+ Version bump, bug 532016.
*wxGTK-3.0.1.1 (06 Oct 2014)
1.1 x11-libs/wxGTK/wxGTK-3.0.2.0.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-3.0.2.0.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-3.0.2.0.ebuild?rev=1.1&content-type=text/plain
Index: wxGTK-3.0.2.0.ebuild
===
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-3.0.2.0.ebuild,v 1.1
2014/12/31 17:37:49 floppym Exp $
EAPI="5"
inherit eutils flag-o-matic
DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
HOMEPAGE="http://wxwidgets.org/";
# we use the wxPython tarballs because they include the full wxGTK sources and
# docs, and are released more frequently than wxGTK.
SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
~x86-macos"
IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
SLOT="3.0"
RDEPEND="
dev-libs/expat
sdl?( media-libs/libsdl )
X? (
>=dev-libs/glib-2.22:2
media-libs/libpng:0=
sys-libs/zlib
virtual/jpeg
>=x11-libs/gtk+-2.18:2
x11-libs/gdk-pixbuf
x11-libs/libSM
x11-libs/libXxf86vm
x11-libs/pango[X]
gstreamer? (
media-libs/gstreamer:0.10
media-libs/gst-plugins-base:0.10 )
libnotify? ( x11-libs/libnotify )
opengl? ( virtual/opengl )
tiff? ( media-libs/tiff:0 )
webkit? ( net-libs/webkit-gtk:2 )
)
aqua? (
>=x11-libs/gtk+-2.4[aqua=]
virtual/jpeg
tiff? ( media-libs/tiff:0 )
)"
DEPEND="${RDEPEND}
virtual/pkgconfig
opengl? ( virtual/glu )
X? (
x11-proto/xproto
x11-proto/xineramaproto
x11-proto/xf86vidmodeproto
)"
PDEPEND=">=app-admin/eselect-wxwidgets-20131230"
LICENSE="wxWinLL-3
GPL-2
doc?( wxWinFDL-3 )"
S="${WORKDIR}/wxPython-src-${PV}"
src_prepare() {
epatch "${FILESDIR}"/${PN}-3.0.0.0-collision.patch
# https://bugs.gentoo.org/421851
# https://bugs.gentoo.org/499984
sed -i -e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" configure || die
epatch_user
}
src_configure() {
local myconf
# X independent options
myconf="
--with-zlib=sys
--with-expat=sys
--enable-compat28
$(use_with sdl)"
# debug in >=2.9
# there is no longer separate debug libraries (gtk2ud)
# wxDEBUG_LEVEL=1 is the default and we will leave it enabled
# wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
# apps can disable these features by building w/ -NDEBUG or
wxDEBUG_LEVEL_0.
# http://docs.wxwidgets.org/3.0/overview_debugging.html
#
http://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63df/0
[gentoo-commits] gentoo-x86 commit in games-mud/tintin/files: tintin-2.00.9-ldpermission.patch
mr_bones_14/12/31 17:22:09 Removed: tintin-2.00.9-ldpermission.patch Log: old (Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
[gentoo-commits] gentoo-x86 commit in games-mud/tintin: ChangeLog tintin-2.00.9.ebuild
mr_bones_14/12/31 17:22:09 Modified: ChangeLog Removed: tintin-2.00.9.ebuild Log: old (Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit) Revision ChangesPath 1.134games-mud/tintin/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-mud/tintin/ChangeLog?rev=1.134&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-mud/tintin/ChangeLog?rev=1.134&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-mud/tintin/ChangeLog?r1=1.133&r2=1.134 Index: ChangeLog === RCS file: /var/cvsroot/gentoo-x86/games-mud/tintin/ChangeLog,v retrieving revision 1.133 retrieving revision 1.134 diff -u -r1.133 -r1.134 --- ChangeLog 31 Dec 2014 16:12:45 - 1.133 +++ ChangeLog 31 Dec 2014 17:22:09 - 1.134 @@ -1,6 +1,10 @@ # ChangeLog for games-mud/tintin # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-mud/tintin/ChangeLog,v 1.133 2014/12/31 16:12:45 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-mud/tintin/ChangeLog,v 1.134 2014/12/31 17:22:09 mr_bones_ Exp $ + + 31 Dec 2014; Michael Sterrett + -files/tintin-2.00.9-ldpermission.patch, -tintin-2.00.9.ebuild: + old 31 Dec 2014; Agostino Sarubbo tintin-2.01.0.ebuild: Stable for ppc, wrt bug #531472
[gentoo-commits] gentoo-x86 commit in games-puzzle/gtetrinet: ChangeLog gtetrinet-0.7.11-r1.ebuild
mr_bones_14/12/31 17:20:36 Modified: ChangeLog Removed: gtetrinet-0.7.11-r1.ebuild Log: old (Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit) Revision ChangesPath 1.34 games-puzzle/gtetrinet/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/gtetrinet/ChangeLog?rev=1.34&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/gtetrinet/ChangeLog?rev=1.34&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/gtetrinet/ChangeLog?r1=1.33&r2=1.34 Index: ChangeLog === RCS file: /var/cvsroot/gentoo-x86/games-puzzle/gtetrinet/ChangeLog,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- ChangeLog 31 Dec 2014 16:12:24 - 1.33 +++ ChangeLog 31 Dec 2014 17:20:36 - 1.34 @@ -1,6 +1,10 @@ # ChangeLog for games-puzzle/gtetrinet # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gtetrinet/ChangeLog,v 1.33 2014/12/31 16:12:24 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gtetrinet/ChangeLog,v 1.34 2014/12/31 17:20:36 mr_bones_ Exp $ + + 31 Dec 2014; Michael Sterrett + -gtetrinet-0.7.11-r1.ebuild: + old 31 Dec 2014; Agostino Sarubbo gtetrinet-0.7.11-r3.ebuild: Stable for ppc, wrt bug #531456
