diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-06-06 11:28:04 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-06-06 11:28:04 +0000 |
commit | 07b070063b8ab5a860bbc9cd2d64c791c9881c2f (patch) | |
tree | 2fa93c9ab7b3c92dc03ff46c2d74fc234c84efa3 /app-editors | |
parent | version bump, #322063 (diff) | |
download | historical-07b070063b8ab5a860bbc9cd2d64c791c9881c2f.tar.gz historical-07b070063b8ab5a860bbc9cd2d64c791c9881c2f.tar.bz2 historical-07b070063b8ab5a860bbc9cd2d64c791c9881c2f.zip |
Fix sandbox violation wrt #296891 by Kevin Pyle. Force Python 2.x wrt #311177.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'app-editors')
-rw-r--r-- | app-editors/scribes/ChangeLog | 15 | ||||
-rw-r--r-- | app-editors/scribes/Manifest | 7 | ||||
-rw-r--r-- | app-editors/scribes/files/scribes-0.3.3.3-sandbox.patch | 16 | ||||
-rw-r--r-- | app-editors/scribes/metadata.xml | 2 | ||||
-rw-r--r-- | app-editors/scribes/scribes-0.3.3.3.ebuild | 38 |
5 files changed, 48 insertions, 30 deletions
diff --git a/app-editors/scribes/ChangeLog b/app-editors/scribes/ChangeLog index 3bbbbd52de0e..55b896e940a3 100644 --- a/app-editors/scribes/ChangeLog +++ b/app-editors/scribes/ChangeLog @@ -1,15 +1,16 @@ # ChangeLog for app-editors/scribes -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/scribes/ChangeLog,v 1.5 2008/11/24 13:33:11 ssuominen Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/scribes/ChangeLog,v 1.6 2010/06/06 11:28:04 ssuominen Exp $ - 24 Nov 2008; <ssuominen@gentoo.org> metadata.xml: - Remove my old e-mail drac at gentoo.org from metadata.xml and leave this - package for the desktop-misc herd. + 06 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> + scribes-0.3.3.3.ebuild, +files/scribes-0.3.3.3-sandbox.patch: + Fix sandbox violation wrt #296891 by Kevin Pyle. Force Python 2.x wrt + #311177. 29 May 2008; Ali Polatel <hawking@gentoo.org> scribes-0.3.3.3.ebuild: python_mod_optimize is ROOT aware. - 23 Jan 2008; Samuli Suominen <drac@gentoo.org> scribes-0.3.3.3.ebuild: + 23 Jan 2008; Samuli Suominen <ssuominen@gentoo.org> scribes-0.3.3.3.ebuild: Pass --disable-scrollkeeper in pkg_setup. 21 Jan 2008; Christian Faulhammer <opfer@gentoo.org> @@ -18,6 +19,6 @@ *scribes-0.3.3.3 (13 Jan 2008) - 13 Jan 2008; Samuli Suominen <drac@gentoo.org> +scribes-0.3.3.3.ebuild: + 13 Jan 2008; Samuli Suominen <ssuominen@gentoo.org> +scribes-0.3.3.3.ebuild: Initial commit for bug 106964, thanks to Mystilleef. diff --git a/app-editors/scribes/Manifest b/app-editors/scribes/Manifest index 863929641a4f..d15ca864f1b7 100644 --- a/app-editors/scribes/Manifest +++ b/app-editors/scribes/Manifest @@ -1,4 +1,5 @@ +AUX scribes-0.3.3.3-sandbox.patch 407 RMD160 157515e20c8a89a0d347e390e053210f70e98865 SHA1 45ab7796826c365320393427ec59b4b55536d446 SHA256 dd8faf1962a9537b2d8b5d282ceb03d878f3b9527c065e2114f0381e8d77ec82 DIST scribes-0.3.3.3.tar.bz2 939149 RMD160 3fbd9c45e93590c069693e0b4c7b2ca7f73bd92f SHA1 7ff59a448730f03970258251a15763b90b1854e9 SHA256 6d6f4966d2593a5c61b56ea6fca37acbbf927b51c0382b511bb53952b08a5802 -EBUILD scribes-0.3.3.3.ebuild 1271 RMD160 7be3db73d0cf9dd9b70dc3a685a35a1d2271e61e SHA1 82ed800734d6d26dff1651d4c95a9a9806ecbbe3 SHA256 ffb8f1a874724c6ea9a0bfe0bf16b62b948ee03d09461781fc31a1611441b5ac -MISC ChangeLog 880 RMD160 cdcef6cf975640d220513b6fdb652e3be9219967 SHA1 f1b21c3a5c1203fb66e0c8c3f4c55ebb64f021a3 SHA256 fa849f3f3c33ac7edb552c6d107893b8bffcfd337c90f516481630ac561b6a21 -MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 +EBUILD scribes-0.3.3.3.ebuild 1225 RMD160 9f4f738d749d99f9d4c3d7e72b86c8aa8e805953 SHA1 92f850f7580417176aa796d96fcbe8c8c51ce90e SHA256 8a6f3139a9c19d9c7f25010247348f858b22fd1e39b4d9e64ece5ce02e259454 +MISC ChangeLog 927 RMD160 5cd52c25b7ae40c7fb7fab00d997e83d52876e5d SHA1 4e78cdbe08ef9fd9e7d1d2b68020c0121077988b SHA256 5d30729f3d0bb91519511bd1f9fb36f9a2d27e028703c3aee2552fce909bd916 +MISC metadata.xml 167 RMD160 6f174fdd5033945a3da1b7bbea9796fe17ba2bf8 SHA1 26b8b030985c93a71d6d34f25249320a30b22f36 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241 diff --git a/app-editors/scribes/files/scribes-0.3.3.3-sandbox.patch b/app-editors/scribes/files/scribes-0.3.3.3-sandbox.patch new file mode 100644 index 000000000000..95737be67e27 --- /dev/null +++ b/app-editors/scribes/files/scribes-0.3.3.3-sandbox.patch @@ -0,0 +1,16 @@ +http://bugs.gentoo.org/296891 + +--- SCRIBES/Makefile.am ++++ SCRIBES/Makefile.am +@@ -15,11 +15,6 @@ + rm -f $(python_files) $(python_files).tmp + $(edit) $(python_in_files) > $(python_files).tmp + mv $(python_files).tmp $(python_files) +- if [ -d $(scribesdir) ]; then \ +- echo "removing " $(scribesdir) ;\ +- rm -rf $(scribesdir) ;\ +- echo "removed " $(scribesdir) ;\ +- fi + + scribes_PYTHON = \ + info.py \ diff --git a/app-editors/scribes/metadata.xml b/app-editors/scribes/metadata.xml index 731225048652..540f810e069d 100644 --- a/app-editors/scribes/metadata.xml +++ b/app-editors/scribes/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>desktop-misc</herd> + <herd>desktop-misc</herd> </pkgmetadata> diff --git a/app-editors/scribes/scribes-0.3.3.3.ebuild b/app-editors/scribes/scribes-0.3.3.3.ebuild index 11477450a2a6..ffa56350c938 100644 --- a/app-editors/scribes/scribes-0.3.3.3.ebuild +++ b/app-editors/scribes/scribes-0.3.3.3.ebuild @@ -1,10 +1,13 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/scribes/scribes-0.3.3.3.ebuild,v 1.4 2008/05/29 15:37:32 hawking Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/scribes/scribes-0.3.3.3.ebuild,v 1.5 2010/06/06 11:28:04 ssuominen Exp $ -NEED_PYTHON=2.5 +EAPI=3 -inherit gnome2 multilib python +PYTHON_DEPEND="2:2.6" +GCONF_DEBUG=no + +inherit autotools eutils gnome2 python DESCRIPTION="a text editor that is simple, slim and sleek, yet powerful." HOMEPAGE="http://scribes.sourceforge.net" @@ -31,24 +34,21 @@ DEPEND="${RDEPEND} DOCS="AUTHORS ChangeLog CONTRIBUTORS NEWS README TODO TRANSLATORS" pkg_setup() { - G2CONF="${G2CONF} --disable-scrollkeeper" + python_set_active_version 2 + G2CONF="--disable-scrollkeeper" } -src_unpack() { - gnome2_src_unpack - find . -iname *.py[co] -exec rm -f {} \; - rm -f compile.py py-compile - touch compile.py py-compile - fperms +x compile.py py-compile -} +src_prepare() { + epatch "${FILESDIR}"/${P}-sandbox.patch + eautoreconf + + ln -nfs $(type -P true) py-compile || die + python_convert_shebangs -r 2 . -pkg_postinst() { - gnome2_pkg_postinst - python_version - python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/SCRIBES + gnome2_src_prepare } -pkg_postrm() { - gnome2_pkg_postrm - python_mod_cleanup +src_install() { + gnome2_src_install + find "${ED}" -name "*.py[co]" -exec rm -f {} + } |