calculate
/
gentoo-overlay
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Sync with portage [Sat Apr 12 15:42:10 MSK 2014].

Browse Source
mhiretskiy
root 10 years ago
parent c207b3c8c5
commit 72b8614402
404 changed files with 6882 additions and 5098 deletions
Show Stats Download Patch File Download Diff File

4
app-admin/eselect-ctags/eselect-ctags-1.16.ebuild
Unescape View File

@ -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-admin/eselect-ctags/eselect-ctags-1.16.ebuild,v 1.1 2014/03/13 16:40:09 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-ctags/eselect-ctags-1.16.ebuild,v 1.2 2014/04/11 16:32:40 jer Exp $
EAPI=5
@ -11,7 +11,7 @@ SRC_URI="http://dev.gentoo.org/~ulm/emacs/${MY_P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND=">=app-admin/eselect-1.2.3"

4
app-admin/eselect-emacs/eselect-emacs-1.16.ebuild
Unescape View File

@ -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-admin/eselect-emacs/eselect-emacs-1.16.ebuild,v 1.1 2014/03/13 16:40:45 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-emacs/eselect-emacs-1.16.ebuild,v 1.2 2014/04/11 16:32:45 jer Exp $
EAPI=5
@ -10,7 +10,7 @@ SRC_URI="http://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
RDEPEND=">=app-admin/eselect-1.2.6
~app-admin/eselect-ctags-${PV}"

4
app-admin/eselect/eselect-1.4.1.ebuild
Unescape View File

@ -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-admin/eselect/eselect-1.4.1.ebuild,v 1.3 2014/04/02 18:54:49 maekke Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.4.1.ebuild,v 1.5 2014/04/12 09:38:41 ago Exp $
EAPI=4
@ -12,7 +12,7 @@ SRC_URI="http://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-2.5 )"
SLOT="0"
KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs vim-syntax"
RDEPEND="sys-apps/sed

85
app-admin/gam-server/gam-server-0.1.10-r2.ebuild
Unescape View File

@ -0,0 +1,85 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/gam-server/gam-server-0.1.10-r2.ebuild,v 1.1 2014/04/12 08:50:47 mgorny Exp $
EAPI="5"
GNOME_ORG_MODULE="gamin"
GNOME_TARBALL_SUFFIX="bz2"
inherit autotools eutils flag-o-matic libtool multilib gnome.org
DESCRIPTION="Library providing the FAM File Alteration Monitor API"
HOMEPAGE="http://www.gnome.org/~veillard/gamin/"
SRC_URI="${SRC_URI}
mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2
http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="debug kernel_linux"
RDEPEND=">=dev-libs/glib-2:2
>=dev-libs/libgamin-0.1.10
!app-admin/fam
!<app-admin/gamin-0.1.10"
DEPEND="${RDEPEND}"
#S=${WORKDIR}/${MY_P}
src_prepare() {
mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
# Fix compile warnings; bug #188923
epatch "${DISTDIR}/gamin-0.1.9-freebsd.patch.bz2"
# Fix file-collision due to shared library, upstream bug #530635
epatch "${FILESDIR}/${PN}-0.1.10-noinst-lib.patch"
# Fix compilation with latest glib, bug #382783
epatch "${FILESDIR}/${PN}-0.1.10-G_CONST_RETURN-removal.patch"
# Fix crosscompilation issues, bug #267604
epatch "${FILESDIR}/${PN}-0.1.10-crosscompile-fix.patch"
# Enable linux specific features on armel, upstream bug #588338
epatch "${FILESDIR}/${P}-armel-features.patch"
# Fix deadlocks with glib-2.32, bug #413331, upstream #667230
epatch "${FILESDIR}/${P}-ih_sub_cancel-deadlock.patch"
# Drop DEPRECATED flags
sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' server/Makefile.am || die
sed -i \
-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
configure.in || die #466948
# autoconf is required as the user-cflags patch modifies configure.in
# however, elibtoolize is also required, so when the above patch is
# removed, replace the following call with a call to elibtoolize
AT_M4DIR="${WORKDIR}" eautoreconf
}
src_configure() {
# fixes bug 225403
#append-flags "-D_GNU_SOURCE"
if ! has_version virtual/pkgconfig; then
export DAEMON_CFLAGS="-I/usr/include/glib-2.0 -I/usr/$(get_libdir)/glib-2.0/include"
export DAEMON_LIBS="-lglib-2.0"
fi
econf \
--disable-debug \
--disable-libgamin \
--without-python \
$(use_enable kernel_linux inotify) \
$(use_enable debug debug-api)
}
src_install() {
emake DESTDIR="${D}" install || die
}

223
app-admin/glance/files/CVE-2014-0162-2013.2.3.patch
Unescape View File

@ -0,0 +1,223 @@
From 13069a4017d36a549576a21ca3ec5b15c411effc Mon Sep 17 00:00:00 2001
From: Zhi Yan Liu <zhiyanl@cn.ibm.com>
Date: Sat, 29 Mar 2014 03:35:35 +0800
Subject: [PATCH] To prevent remote code injection on Sheepdog store
Change-Id: Iae92eaf9eb023f36a1bab7c20ea41c985f2bf51b
Signed-off-by: Zhi Yan Liu <zhiyanl@cn.ibm.com>
---
glance/store/sheepdog.py | 61 +++++++++++++++++-------------
glance/tests/unit/test_sheepdog_store.py | 3 +-
glance/tests/unit/test_store_location.py | 13 ++++---
3 files changed, 45 insertions(+), 32 deletions(-)
diff --git a/glance/store/sheepdog.py b/glance/store/sheepdog.py
index d10aea7..2f75441 100644
--- a/glance/store/sheepdog.py
+++ b/glance/store/sheepdog.py
@@ -25,6 +25,7 @@ from glance.common import exception
from glance.openstack.common import excutils
import glance.openstack.common.log as logging
from glance.openstack.common import processutils
+from glance.openstack.common import uuidutils
import glance.store
import glance.store.base
import glance.store.location
@@ -32,7 +33,7 @@ import glance.store.location
LOG = logging.getLogger(__name__)
-DEFAULT_ADDR = 'localhost'
+DEFAULT_ADDR = '127.0.0.1'
DEFAULT_PORT = '7000'
DEFAULT_CHUNKSIZE = 64 # in MiB
@@ -63,18 +64,14 @@ class SheepdogImage:
self.chunk_size = chunk_size
def _run_command(self, command, data, *params):
- cmd = ("collie vdi %(command)s -a %(addr)s -p %(port)s %(name)s "
- "%(params)s" %
- {"command": command,
- "addr": self.addr,
- "port": self.port,
- "name": self.name,
- "params": " ".join(map(str, params))})
+ cmd = ["collie", "vdi"]
+ cmd.extend(command)
+ cmd.extend(["-a", self.addr, "-p", self.port, self.name])
+ cmd.extend(params)
try:
- return processutils.execute(
- cmd, process_input=data, shell=True)[0]
- except processutils.ProcessExecutionError as exc:
+ return processutils.execute(*cmd, process_input=data)[0]
+ except (processutils.ProcessExecutionError, OSError) as exc:
LOG.error(exc)
raise glance.store.BackendException(exc)
@@ -84,7 +81,7 @@ class SheepdogImage:
Sheepdog Usage: collie vdi list -r -a address -p port image
"""
- out = self._run_command("list -r", None)
+ out = self._run_command(["list", "-r"], None)
return long(out.split(' ')[3])
def read(self, offset, count):
@@ -94,7 +91,7 @@ class SheepdogImage:
Sheepdog Usage: collie vdi read -a address -p port image offset len
"""
- return self._run_command("read", None, str(offset), str(count))
+ return self._run_command(["read"], None, str(offset), str(count))
def write(self, data, offset, count):
"""
@@ -103,7 +100,7 @@ class SheepdogImage:
Sheepdog Usage: collie vdi write -a address -p port image offset len
"""
- self._run_command("write", data, str(offset), str(count))
+ self._run_command(["write"], data, str(offset), str(count))
def create(self, size):
"""
@@ -111,7 +108,7 @@ class SheepdogImage:
Sheepdog Usage: collie vdi create -a address -p port image size
"""
- self._run_command("create", None, str(size))
+ self._run_command(["create"], None, str(size))
def delete(self):
"""
@@ -119,7 +116,7 @@ class SheepdogImage:
Sheepdog Usage: collie vdi delete -a address -p port image
"""
- self._run_command("delete", None)
+ self._run_command(["delete"], None)
def exist(self):
"""
@@ -127,7 +124,7 @@ class SheepdogImage:
Sheepdog Usage: collie vdi list -r -a address -p port image
"""
- out = self._run_command("list -r", None)
+ out = self._run_command(["list", "-r"], None)
if not out:
return False
else:
@@ -138,7 +135,7 @@ class StoreLocation(glance.store.location.StoreLocation):
"""
Class describing a Sheepdog URI. This is of the form:
- sheepdog://image
+ sheepdog://image-id
"""
@@ -149,10 +146,14 @@ class StoreLocation(glance.store.location.StoreLocation):
return "sheepdog://%s" % self.image
def parse_uri(self, uri):
- if not uri.startswith('sheepdog://'):
- raise exception.BadStoreUri(uri, "URI must start with %s://" %
- 'sheepdog')
- self.image = uri[11:]
+ valid_schema = 'sheepdog://'
+ if not uri.startswith(valid_schema):
+ raise exception.BadStoreUri(_("URI must start with %s://") %
+ valid_schema)
+ self.image = uri[len(valid_schema):]
+ if not uuidutils.is_uuid_like(self.image):
+ raise exception.BadStoreUri(_("URI must contains well-formated "
+ "image id"))
class ImageIterator(object):
@@ -192,7 +193,7 @@ class Store(glance.store.base.Store):
try:
self.chunk_size = CONF.sheepdog_store_chunk_size * 1024 * 1024
- self.addr = CONF.sheepdog_store_address
+ self.addr = CONF.sheepdog_store_address.strip()
self.port = CONF.sheepdog_store_port
except cfg.ConfigFileValueError as e:
reason = _("Error in store configuration: %s") % e
@@ -200,10 +201,18 @@ class Store(glance.store.base.Store):
raise exception.BadStoreConfiguration(store_name='sheepdog',
reason=reason)
+ if ' ' in self.addr:
+ reason = (_("Invalid address configuration of sheepdog store: %s")
+ % self.addr)
+ LOG.error(reason)
+ raise exception.BadStoreConfiguration(store_name='sheepdog',
+ reason=reason)
+
try:
- processutils.execute("collie", shell=True)
- except processutils.ProcessExecutionError as exc:
- reason = _("Error in store configuration: %s") % exc
+ cmd = ["collie", "vdi", "list", "-a", self.addr, "-p", self.port]
+ processutils.execute(*cmd)
+ except Exception as e:
+ reason = _("Error in store configuration: %s") % e
LOG.error(reason)
raise exception.BadStoreConfiguration(store_name='sheepdog',
reason=reason)
diff --git a/glance/tests/unit/test_sheepdog_store.py b/glance/tests/unit/test_sheepdog_store.py
index 8eef86b..bea7e29 100644
--- a/glance/tests/unit/test_sheepdog_store.py
+++ b/glance/tests/unit/test_sheepdog_store.py
@@ -57,4 +57,5 @@ class TestStore(base.StoreClearingUnitTest):
'fake_image_id',
utils.LimitingReader(StringIO.StringIO('xx'), 1),
2)
- self.assertEqual(called_commands, ['list -r', 'create', 'delete'])
+ self.assertEqual([['list', '-r'], ['create'], ['delete']],
+ called_commands)
diff --git a/glance/tests/unit/test_store_location.py b/glance/tests/unit/test_store_location.py
index 7eec171..2464ebb 100644
--- a/glance/tests/unit/test_store_location.py
+++ b/glance/tests/unit/test_store_location.py
@@ -52,7 +52,7 @@ class TestStoreLocation(base.StoreClearingUnitTest):
'rbd://imagename',
'rbd://fsid/pool/image/snap',
'rbd://%2F/%2F/%2F/%2F',
- 'sheepdog://imagename',
+ 'sheepdog://244e75f1-9c69-4167-9db7-1aa7d1973f6c',
'cinder://12345678-9012-3455-6789-012345678901',
]
@@ -367,15 +367,18 @@ class TestStoreLocation(base.StoreClearingUnitTest):
"""
Test the specific StoreLocation for the Sheepdog store
"""
- uri = 'sheepdog://imagename'
+ uri = 'sheepdog://244e75f1-9c69-4167-9db7-1aa7d1973f6c'
loc = glance.store.sheepdog.StoreLocation({})
loc.parse_uri(uri)
- self.assertEqual('imagename', loc.image)
+ self.assertEqual('244e75f1-9c69-4167-9db7-1aa7d1973f6c', loc.image)
- bad_uri = 'sheepdog:/image'
+ bad_uri = 'sheepdog:/244e75f1-9c69-4167-9db7-1aa7d1973f6c'
self.assertRaises(exception.BadStoreUri, loc.parse_uri, bad_uri)
- bad_uri = 'http://image'
+ bad_uri = 'http://244e75f1-9c69-4167-9db7-1aa7d1973f6c'
+ self.assertRaises(exception.BadStoreUri, loc.parse_uri, bad_uri)
+
+ bad_uri = 'image; name'
self.assertRaises(exception.BadStoreUri, loc.parse_uri, bad_uri)
def test_cinder_store_good_location(self):
--
1.7.9.5

5
app-admin/glance/glance-2013.2.3.ebuild → app-admin/glance/glance-2013.2.3-r1.ebuild
Unescape View File

@ -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-admin/glance/glance-2013.2.3.ebuild,v 1.1 2014/04/06 06:07:42 prometheanfire Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.2.3-r1.ebuild,v 1.1 2014/04/11 15:19:16 prometheanfire Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
@ -85,7 +85,8 @@ RDEPEND=">=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
dev-python/pyopenssl[${PYTHON_USEDEP}]
>=dev-python/six-1.4.1[${PYTHON_USEDEP}]"
PATCHES=( "${FILESDIR}/${PN}-2013.2-sphinx_mapping.patch" )
PATCHES=( "${FILESDIR}/${PN}-2013.2-sphinx_mapping.patch"
"${FILESDIR}/CVE-2014-0162-2013.2.3.patch" )
pkg_setup() {
enewgroup glance

2
app-admin/glance/metadata.xml
Unescape View File

@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>openstack</herd>
<maintainer>
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
<longdescription lang="en">
Provides services for discovering, registering, and retrieving virtual

1
app-arch/unrar/Manifest
Unescape View File

@ -1,3 +1,4 @@
DIST unrarsrc-4.2.4.tar.gz 164641 SHA256 9432bf798e5f7123f3060f37b75b7c07f36f0091305f46473dcae9154f8cd686 SHA512 54bdc16c940deb6e5759ddec9739381f0e1b5e2279548ac367eb32c4ff79cd496712692feaf46f4ce3b2ccfa8d622b7c45fb8070420b16315226627c45fef850 WHIRLPOOL 197310c41725280d6a5c4fa3da9d8411e419f20e41f6c645534b37d206ce67474c8b320811a7c7f2acbc375ef0341ec57adfe82a6be7f6bdabe2871841669739
DIST unrarsrc-5.0.14.tar.gz 209707 SHA256 e276ea30a2dc9b8961a4268772e5b6caccaa984664e2d5255a43fcb0f5d59806 SHA512 91b05bd2974e0a1cb8bd8f01ee90637c9c48da71a4ffa74e161de969f17bedbcda0cfbac128d366ffa5065e8195004fe82763a2a1e8628f0016621b1c2d364f2 WHIRLPOOL 665833a5cac5cfddaa6bf852b6820e8447604019286f7f81dce910ad49b8eccf5a4ceab2c1177837e71492ba0c37d2d288b78eb0a531fd47d34cdd8256fd7f19
DIST unrarsrc-5.1.1.tar.gz 215442 SHA256 eba573f4c1b73059c78e99f7a0519f0f95fcb345cf8558bdcdb7540091c62a89 SHA512 f7459d3f476dfa06a1115588adc438c091ec50ec76b523a94ce730ee670ae3610679b21945b16f976f020d3e0e352842c7dac987a74745f6afa34fc4676bbbf7 WHIRLPOOL 9de3bc1dafb82b9d4eed3a24933965dd6ecb9c710d9355d7492fb3118587887ea44eb3eca992cc9c6342716ecc3c751f89c99287c8cd003c747780f61c0bf7e2
DIST unrarsrc-5.1.2.tar.gz 214207 SHA256 98257d7b74a2db18225da2a4bb564cbd591fe10c83bc51430882d3c18965840c SHA512 128f58670d3b04eb8120bd492d5883fd9cbb6b4618505c85790a57ca13346027c868dcd00ea749d204684c6443f59088e352d30ec85089d548fe9282575a801f WHIRLPOOL 1b602078e0a4c0eae89309b00b3b8047662e55469bdf5cf588aecac0148133c14544a7050bc535fd5afdb2a94267e78d29e8d19ef87976bac80ddea882588773

4
app-arch/unrar/unrar-5.0.14.ebuild
Unescape View File

@ -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/unrar/unrar-5.0.14.ebuild,v 1.3 2014/04/02 18:53:48 maekke Exp $
# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-5.0.14.ebuild,v 1.5 2014/04/12 09:37:18 ago Exp $
EAPI=5
inherit eutils flag-o-matic multilib toolchain-funcs
@ -13,7 +13,7 @@ SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"
LICENSE="unRAR"
SLOT="0"
KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE=""
RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"

56
app-arch/unrar/unrar-5.1.2.ebuild
Unescape View File

@ -0,0 +1,56 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-5.1.2.ebuild,v 1.1 2014/04/11 21:58:50 ssuominen Exp $
EAPI=5
inherit eutils flag-o-matic multilib toolchain-funcs
MY_PN=${PN}src
DESCRIPTION="Uncompress rar files"
HOMEPAGE="http://www.rarlab.com/rar_add.htm"
SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"
LICENSE="unRAR"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE=""
RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
S=${WORKDIR}/unrar
src_prepare() {
epatch "${FILESDIR}"/${PN}-5.0.2-build.patch
sed -i \
-e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" \
-e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" \
makefile || die
}
src_compile() {
unrar_make() {
emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
}
unrar_make CXXFLAGS+=" -fPIC" lib
ln -s libunrar$(get_libname ${PV%.*.*}) libunrar$(get_libname)
ln -s libunrar$(get_libname ${PV%.*.*}) libunrar$(get_libname ${PV})
# The stupid code compiles a lot of objects differently if
# they're going into a lib (-DRARDLL) or into the main app.
# So for now, we can't link the main app against the lib.
unrar_make clean
unrar_make
}
src_install() {
dobin unrar
dodoc readme.txt
dolib.so libunrar*
insinto /usr/include/libunrar${PV%.*.*}
doins *.hpp
dosym libunrar${PV%.*.*} /usr/include/libunrar
}

1
app-cdr/xfburn/Manifest
Unescape View File

@ -1,2 +1,3 @@
DIST xfburn-0.4.3_p20121021.tar.xz 464084 SHA256 3c3541765da9263e435562188ec2c137fb31d19591dd169b6fb2ef2fefa01bc9 SHA512 5c7cf0e14f632769bc0e249c104207dbf3f2bbd9b9836e9aa409b55f44df735a6ddcf4cb41ab71072ab020b1be51f81e2f2b68ed5b04b52907df216bb68acf7d WHIRLPOOL 75bc723699a862e1a243b3bf0ab1a99b49607c25862da412a74d65bede95170e42a3917ca211cabbaf24c2f30ea37540eb7578cbcbd5817180b720b65ee7d16b
DIST xfburn-0.5.0.tar.bz2 745720 SHA256 76fad0d4256481830d22d4c3d0da9feb1c26c93ad3ed31ab77b9ffdd9eb02ecb SHA512 f0d3fe7adeac280f2023f9a75129d48889f88c39c1e18695a9792f7181f34223f276974b14faa3cd5e08187d665be2b70ec4f2a365c043daba282734b911cf29 WHIRLPOOL 4499ed88be1fa1b82bbc118e9efdc7358534a4d72e67fb6c1eeb508cfa68f2ed069d0c7914ca726d3e1d8a3a1a443e7f07f4752a51eacf6dc3bf0c5ab7a33ee1
DIST xfburn-0.5.2.tar.bz2 760833 SHA256 63682aab3c30c77e464b2b3b84606d1e1dcefc98e7042072fa09b729d6f84412 SHA512 3c6f27e2c8e5200d620bf32f938a1fb044b371a9fe0b5474ba8c1a487c79a7761e144ec8490f04c2389c96bc980b9f2bdfebce9d24dea30c5caae451bb9dcf5e WHIRLPOOL a88f482d899ecaf89666f34b583b90b02f080ec2dc074f4809b98c8e65a824f3f229dd006c8ccbcd3c580e3c3885bea0a0c9fa04ef8871071b6bc9e237029164

38
app-cdr/xfburn/xfburn-0.5.2.ebuild
Unescape View File

@ -0,0 +1,38 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/xfburn-0.5.2.ebuild,v 1.1 2014/04/11 12:24:18 ssuominen Exp $
EAPI=5
inherit xfconf
DESCRIPTION="GTK+ based CD and DVD burning application"
HOMEPAGE="http://goodies.xfce.org/projects/applications/xfburn"
SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~x86"
IUSE="debug gstreamer +udev"
RDEPEND=">=dev-libs/glib-2.32
>=dev-libs/libburn-0.4.2
>=dev-libs/libisofs-0.6.2
>=x11-libs/gtk+-2.24:2
>=xfce-base/exo-0.6
>=xfce-base/libxfce4ui-4.10
gstreamer? ( >=media-libs/gst-plugins-base-0.10.20:0.10 )
udev? ( virtual/udev[gudev] )"
DEPEND="${RDEPEND}
dev-util/intltool
sys-devel/gettext
virtual/pkgconfig"
pkg_setup() {
XFCONF=(
$(use_enable udev gudev)
$(use_enable gstreamer)
$(xfconf_use_debug)
)
DOCS=( AUTHORS ChangeLog NEWS README TODO )
}

4
app-crypt/ccid/ccid-1.4.15.ebuild
Unescape View File

@ -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-crypt/ccid/ccid-1.4.15.ebuild,v 1.3 2014/04/05 20:34:06 jer Exp $
# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ccid-1.4.15.ebuild,v 1.5 2014/04/12 09:36:48 ago Exp $
EAPI=5
@ -14,7 +14,7 @@ SRC_URI="http://alioth.debian.org/frs/download.php/file/${STUPID_NUM}/${P}.tar.b
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="twinserial +usb"
RDEPEND=">=sys-apps/pcsc-lite-1.8.3

4
app-dicts/myspell-de-alt/myspell-de-alt-20120929.ebuild
Unescape View File

@ -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-dicts/myspell-de-alt/myspell-de-alt-20120929.ebuild,v 1.1 2014/02/08 14:06:19 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-dicts/myspell-de-alt/myspell-de-alt-20120929.ebuild,v 1.2 2014/04/11 16:33:46 jer Exp $
EAPI=5
@ -25,7 +25,7 @@ SRC_URI="http://extensions.libreoffice.org/extension-center/german-de-de-1901-ol
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
src_prepare() {
# Nicely rename; http://www.iana.org/assignments/language-subtag-registry

2
app-editors/emacs-vcs/Manifest
Unescape View File

@ -1,3 +1 @@
DIST emacs-24.3.50_pre20140131.tar.xz 23942528 SHA256 d49baad2ea008d057236defb807499b0099d72839961ee9ac42280e8dc296275 SHA512 bbc9910261534bdcf552fb020643db98ce4764ff5ddce16ce35805163d6e5b08ce08216906f5eaee904c132709e9ac06beb35be0591b7c486c8fa9ab96ca9c22 WHIRLPOOL 0d03148b1c50f416ab8db990f30ddd1660130634e72a714f9d9a0bf83bd7f1359f726a3518786b7ea4625967eed21b5a6f6706cfba769e3f58eae1354fdba26f
DIST emacs-24.3.50_pre20140228.tar.xz 23970004 SHA256 16cc3ae281b3a059a8af3b2d865ae0dd5da51a6f009130bc2d372b473823f959 SHA512 d432db8b6efd4e269f0203a37fd99d60c006f1256867c78a21b7027a14a5c1db39ad5cdf6550ee9b06df05d2df553818c827275b99bd5a867b81dc1e21e7ecda WHIRLPOOL c7d5b64a1530af423dcd37f9f2489c694e8516ef4c731804339d6035d20cab9f1353f73561017007387b12125dd99768e01df9b0e0d685a49e51588d68ebd106
DIST emacs-24.3.50_pre20140331.tar.xz 23995832 SHA256 566dad818e037920a46313b7408047ab68aaee5b25b2453cefae59c4a34252d8 SHA512 1cb120f57a91e4c108e89d1a60bdfc402512c7c94ed1d39b22baf891c4924427dbe77a4e84b1ebbf844c5b86ca23287073646cdb6ea2c8cb430333f474ca630f WHIRLPOOL a9c0c3a8b14c5e51c19df963111ce4e7c8e0dadebacd1000f1bc761a8ae7ca58e73adfde44068d3c7696fec33b13bad900d0c47767493f95c3fa4115e2cf3bef

364
app-editors/emacs-vcs/emacs-vcs-24.3.50_pre20140131.ebuild
Unescape View File

@ -1,364 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.50_pre20140131.ebuild,v 1.3 2014/03/15 19:56:16 ulm Exp $
EAPI=5
inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
if [[ ${PV##*.} = 9999 ]]; then
EBZR_PROJECT="emacs"
EBZR_BRANCH="trunk"
EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EBZR_BRANCH}/"
# "Nosmart" is much faster for initial branching.
EBZR_INITIAL_URI="nosmart+${EBZR_REPO_URI}"
EBZR_UNPACK_DIR="${WORKDIR}/emacs"
EBZR_WORKDIR_CHECKOUT="t" #434746
inherit bzr
S="${EBZR_UNPACK_DIR}"
else
SRC_URI="http://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
# FULL_VERSION keeps the full version number, which is needed in
# order to determine some path information correctly for copy/move
# operations later on
FULL_VERSION="${PV%%_*}"
#S="${WORKDIR}/emacs-${FULL_VERSION}"
S="${WORKDIR}/emacs"
fi
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
HOMEPAGE="http://www.gnu.org/software/emacs/"
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="24"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
REQUIRED_USE="?? ( aqua X )"
RDEPEND="sys-libs/ncurses
>=app-admin/eselect-emacs-1.16
>=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?]
net-libs/liblockfile
acl? ( virtual/acl )
alsa? ( media-libs/alsa-lib )
dbus? ( sys-apps/dbus )
gfile? ( >=dev-libs/glib-2.28.6 )
gnutls? ( net-libs/gnutls )
gpm? ( sys-libs/gpm )
hesiod? ( net-dns/hesiod )
kerberos? ( virtual/krb5 )
libxml2? ( >=dev-libs/libxml2-2.2.0 )
selinux? ( sys-libs/libselinux )
zlib? ( sys-libs/zlib )
X? (
x11-libs/libXmu
x11-libs/libXt
x11-misc/xbitmaps
gconf? ( >=gnome-base/gconf-2.26.2 )
gsettings? ( >=dev-libs/glib-2.28.6 )
gif? ( media-libs/giflib )
jpeg? ( virtual/jpeg:0= )
png? ( >=media-libs/libpng-1.4:0= )
svg? ( >=gnome-base/librsvg-2.0 )
tiff? ( media-libs/tiff )
xpm? ( x11-libs/libXpm )
imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
xft? (
media-libs/fontconfig
media-libs/freetype
x11-libs/libXft
m17n-lib? (
>=dev-libs/libotf-0.9.4
>=dev-libs/m17n-lib-1.5.1
)
)
gtk? (
gtk3? ( x11-libs/gtk+:3 )
!gtk3? ( x11-libs/gtk+:2 )
)
!gtk? (
motif? ( >=x11-libs/motif-2.3:0 )
!motif? (
Xaw3d? ( x11-libs/libXaw3d )
!Xaw3d? ( athena? ( x11-libs/libXaw ) )
)
)
)"
DEPEND="${RDEPEND}
alsa? ( virtual/pkgconfig )
dbus? ( virtual/pkgconfig )
gfile? ( virtual/pkgconfig )
gnutls? ( virtual/pkgconfig )
libxml2? ( virtual/pkgconfig )
X? ( virtual/pkgconfig )
gzip-el? ( app-arch/gzip )
pax_kernel? ( sys-apps/paxctl )"
if [[ ${PV##*.} = 9999 ]]; then
DEPEND="${DEPEND}
sys-apps/texinfo"
fi
EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
SITEFILE="20${PN}-${SLOT}-gentoo.el"
src_prepare() {
if [[ ${PV##*.} = 9999 ]]; then
FULL_VERSION=$(sed -n 's/^AC_INIT(emacs,[ \t]*\([^ \t,)]*\).*/\1/p' \
configure.ac)
[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
einfo "Emacs branch: ${EBZR_BRANCH}"
einfo "Revision: ${EBZR_REVISION:-${EBZR_REVNO}}"
einfo "Emacs version number: ${FULL_VERSION}"
[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
|| die "Upstream version number changed to ${FULL_VERSION}"
fi
epatch_user
# Fix filename reference in redirected man page
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
|| die "unable to sed ctags.1"
AT_M4DIR=m4 eautoreconf
}
src_configure() {
strip-flags
if use sh; then
replace-flags "-O[1-9]" -O0 #262359
elif use ia64; then
replace-flags "-O[2-9]" -O1 #325373
else
replace-flags "-O[3-9]" -O2
fi
local myconf
if use alsa; then
use sound || ewarn \
"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
myconf+=" --with-sound=alsa"
else
myconf+=" --with-sound=$(usex sound oss)"
fi
if use X; then
myconf+=" --with-x --without-ns"
myconf+=" $(use_with gconf)"
myconf+=" $(use_with gsettings)"
myconf+=" $(use_with toolkit-scroll-bars)"
myconf+=" $(use_with gif)"
myconf+=" $(use_with jpeg)"
myconf+=" $(use_with png)"
myconf+=" $(use_with svg rsvg)"
myconf+=" $(use_with tiff)"
myconf+=" $(use_with xpm)"
myconf+=" $(use_with imagemagick)"
if use xft; then
myconf+=" --with-xft"
myconf+=" $(use_with m17n-lib libotf)"
myconf+=" $(use_with m17n-lib m17n-flt)"
else
myconf+=" --without-xft"
myconf+=" --without-libotf --without-m17n-flt"
use m17n-lib && ewarn \
"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
fi
local f
if use gtk; then
einfo "Configuring to build with GIMP Toolkit (GTK+)"
myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
for f in motif Xaw3d athena; do
use ${f} && ewarn \
"USE flag \"${f}\" has no effect if \"gtk\" is set."
done
elif use motif; then
einfo "Configuring to build with Motif toolkit"
myconf+=" --with-x-toolkit=motif"
for f in Xaw3d athena; do
use ${f} && ewarn \
"USE flag \"${f}\" has no effect if \"motif\" is set."
done
elif use athena || use Xaw3d; then
einfo "Configuring to build with Athena/Lucid toolkit"
myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
else
einfo "Configuring to build with no toolkit"
myconf+=" --with-x-toolkit=no"
fi
elif use aqua; then
einfo "Configuring to build with Nextstep (Cocoa) support"
myconf+=" --with-ns --disable-ns-self-contained"
myconf+=" --without-x"
else
myconf+=" --without-x --without-ns"
fi
# Save version information in the Emacs binary. It will be available
# in variable "system-configuration-options".
myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
if [[ ${PV##*.} = 9999 ]]; then
myconf+=" EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}"
fi
econf \
--program-suffix="-${EMACS_SUFFIX}" \
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
--with-gameuser="${GAMES_USER_DED:-games}" \
--without-compress-install \
--with-file-notification=$(usev gfile || usev inotify || echo no) \
$(use_enable acl) \
$(use_with dbus) \
$(use_with gnutls) \
$(use_with gpm) \
$(use_with hesiod) \
$(use_with kerberos) $(use_with kerberos kerberos5) \
$(use_with libxml2 xml2) \
$(use_with selinux) \
$(use_with wide-int) \
$(use_with zlib) \
${myconf}
}
src_compile() {
export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
emake
}
src_install () {
emake DESTDIR="${D}" NO_BIN_LINK=t install
mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
|| die "moving emacs executable failed"
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
|| die "moving emacs man page failed"
# move info dir to avoid collisions with the dir file generated by portage
mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
|| die "moving info dir failed"
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
# avoid collision between slots, see bug #169033 e.g.
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
rm -rf "${ED}"/usr/share/{applications,icons}
rm -rf "${ED}"/var
# remove unused <version>/site-lisp dir
rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
if use gzip-el; then
# compress .el files when a corresponding .elc exists
find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
assert "gzip .el failed"
fi
local cdir
if use source; then
cdir="/usr/share/emacs/${FULL_VERSION}/src"
insinto "${cdir}"
# This is not meant to install all the source -- just the
# C source you might find via find-function
doins src/*.{c,h,m}
elif has installsources ${FEATURES}; then
cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
fi
sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
X
;;; ${PN}-${SLOT} site-lisp configuration
X
(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
Y (setq find-function-C-source-directory
Y "${EPREFIX}${cdir}")
X (let ((path (getenv "INFOPATH"))
X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
X (and path
X ;; move Emacs Info dir before anything else in /usr/share/info
X (let* ((p (cons nil (split-string path ":" t))) (q p))
X (while (and (cdr q) (not (string-match re (cadr q))))
X (setq q (cdr q)))
X (setcdr q (cons dir (delete dir (cdr q))))
X (setq Info-directory-list (prune-directory-list (cdr p)))))))
EOF
elisp-site-file-install "${T}/${SITEFILE}" || die
dodoc README BUGS
if use aqua; then
dodir /Applications/Gentoo
rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
mv nextstep/Emacs.app \
"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
fi
DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
through the Emacs eselect module, which also redirects man and info
pages. Therefore, several Emacs versions can be installed at the
same time. \"man emacs.eselect\" for details.
\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
strongly recommended that you use app-admin/emacs-updater to rebuild
all byte-compiled elisp files of the installed Emacs packages."
use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
Installing media-fonts/font-adobe-{75,100}dpi on the X server's
machine would satisfy basic Emacs requirements under X11.
See also https://wiki.gentoo.org/wiki/Project:Emacs/Xft_support
for how to enable anti-aliased fonts."
use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
it into /Applications by yourself."
readme.gentoo_create_doc
}
pkg_preinst() {
# move Info dir file to correct name
local infodir=/usr/share/info/${EMACS_SUFFIX} f
if [[ -f ${ED}${infodir}/dir.orig ]]; then
mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
elif [[ -d "${ED}"${infodir} ]]; then
# this should not happen in EAPI 4
ewarn "Regenerating Info directory index in ${infodir} ..."
rm -f "${ED}"${infodir}/dir{,.*}
for f in "${ED}"${infodir}/*; do
if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
install-info --info-dir="${ED}"${infodir} "${f}" \
|| die "install-info failed"
fi
done
fi
}
pkg_postinst() {
elisp-site-regen
local pvr
for pvr in ${REPLACING_VERSIONS}; do
[[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
done
readme.gentoo_print_elog
if use livecd; then
# force an update of the emacs symlink for the livecd/dvd,
# because some microemacs packages set it with USE=livecd
eselect emacs update
elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
# refresh symlinks in case any installed files have changed
eselect emacs set ${EMACS_SUFFIX}
else
eselect emacs update ifunset
fi
}
pkg_postrm() {
elisp-site-regen
eselect emacs update ifunset
}

364
app-editors/emacs-vcs/emacs-vcs-24.3.50_pre20140228.ebuild
Unescape View File

@ -1,364 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.50_pre20140228.ebuild,v 1.2 2014/03/15 19:56:16 ulm Exp $
EAPI=5
inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
if [[ ${PV##*.} = 9999 ]]; then
EBZR_PROJECT="emacs"
EBZR_BRANCH="trunk"
EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EBZR_BRANCH}/"
# "Nosmart" is much faster for initial branching.
EBZR_INITIAL_URI="nosmart+${EBZR_REPO_URI}"
EBZR_UNPACK_DIR="${WORKDIR}/emacs"
EBZR_WORKDIR_CHECKOUT="t" #434746
inherit bzr
S="${EBZR_UNPACK_DIR}"
else
SRC_URI="http://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
# FULL_VERSION keeps the full version number, which is needed in
# order to determine some path information correctly for copy/move
# operations later on
FULL_VERSION="${PV%%_*}"
#S="${WORKDIR}/emacs-${FULL_VERSION}"
S="${WORKDIR}/emacs"
fi
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
HOMEPAGE="http://www.gnu.org/software/emacs/"
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="24"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
REQUIRED_USE="?? ( aqua X )"
RDEPEND="sys-libs/ncurses
>=app-admin/eselect-emacs-1.16
>=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?]
net-libs/liblockfile
acl? ( virtual/acl )
alsa? ( media-libs/alsa-lib )
dbus? ( sys-apps/dbus )
gfile? ( >=dev-libs/glib-2.28.6 )
gnutls? ( net-libs/gnutls )
gpm? ( sys-libs/gpm )
hesiod? ( net-dns/hesiod )
kerberos? ( virtual/krb5 )
libxml2? ( >=dev-libs/libxml2-2.2.0 )
selinux? ( sys-libs/libselinux )
zlib? ( sys-libs/zlib )
X? (
x11-libs/libXmu
x11-libs/libXt
x11-misc/xbitmaps
gconf? ( >=gnome-base/gconf-2.26.2 )
gsettings? ( >=dev-libs/glib-2.28.6 )
gif? ( media-libs/giflib )
jpeg? ( virtual/jpeg:0= )
png? ( >=media-libs/libpng-1.4:0= )
svg? ( >=gnome-base/librsvg-2.0 )
tiff? ( media-libs/tiff )
xpm? ( x11-libs/libXpm )
imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
xft? (
media-libs/fontconfig
media-libs/freetype
x11-libs/libXft
m17n-lib? (
>=dev-libs/libotf-0.9.4
>=dev-libs/m17n-lib-1.5.1
)
)
gtk? (
gtk3? ( x11-libs/gtk+:3 )
!gtk3? ( x11-libs/gtk+:2 )
)
!gtk? (
motif? ( >=x11-libs/motif-2.3:0 )
!motif? (
Xaw3d? ( x11-libs/libXaw3d )
!Xaw3d? ( athena? ( x11-libs/libXaw ) )
)
)
)"
DEPEND="${RDEPEND}
alsa? ( virtual/pkgconfig )
dbus? ( virtual/pkgconfig )
gfile? ( virtual/pkgconfig )
gnutls? ( virtual/pkgconfig )
libxml2? ( virtual/pkgconfig )
X? ( virtual/pkgconfig )
gzip-el? ( app-arch/gzip )
pax_kernel? ( sys-apps/paxctl )"
if [[ ${PV##*.} = 9999 ]]; then
DEPEND="${DEPEND}
sys-apps/texinfo"
fi
EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
SITEFILE="20${PN}-${SLOT}-gentoo.el"
src_prepare() {
if [[ ${PV##*.} = 9999 ]]; then
FULL_VERSION=$(sed -n 's/^AC_INIT(emacs,[ \t]*\([^ \t,)]*\).*/\1/p' \
configure.ac)
[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
einfo "Emacs branch: ${EBZR_BRANCH}"
einfo "Revision: ${EBZR_REVISION:-${EBZR_REVNO}}"
einfo "Emacs version number: ${FULL_VERSION}"
[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
|| die "Upstream version number changed to ${FULL_VERSION}"
fi
epatch_user
# Fix filename reference in redirected man page
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
|| die "unable to sed ctags.1"
AT_M4DIR=m4 eautoreconf
}
src_configure() {
strip-flags
if use sh; then
replace-flags "-O[1-9]" -O0 #262359
elif use ia64; then
replace-flags "-O[2-9]" -O1 #325373
else
replace-flags "-O[3-9]" -O2
fi
local myconf
if use alsa; then
use sound || ewarn \
"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
myconf+=" --with-sound=alsa"
else
myconf+=" --with-sound=$(usex sound oss)"
fi
if use X; then
myconf+=" --with-x --without-ns"
myconf+=" $(use_with gconf)"
myconf+=" $(use_with gsettings)"
myconf+=" $(use_with toolkit-scroll-bars)"
myconf+=" $(use_with gif)"
myconf+=" $(use_with jpeg)"
myconf+=" $(use_with png)"
myconf+=" $(use_with svg rsvg)"
myconf+=" $(use_with tiff)"
myconf+=" $(use_with xpm)"
myconf+=" $(use_with imagemagick)"
if use xft; then
myconf+=" --with-xft"
myconf+=" $(use_with m17n-lib libotf)"
myconf+=" $(use_with m17n-lib m17n-flt)"
else
myconf+=" --without-xft"
myconf+=" --without-libotf --without-m17n-flt"
use m17n-lib && ewarn \
"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
fi
local f
if use gtk; then
einfo "Configuring to build with GIMP Toolkit (GTK+)"
myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
for f in motif Xaw3d athena; do
use ${f} && ewarn \
"USE flag \"${f}\" has no effect if \"gtk\" is set."
done
elif use motif; then
einfo "Configuring to build with Motif toolkit"
myconf+=" --with-x-toolkit=motif"
for f in Xaw3d athena; do
use ${f} && ewarn \
"USE flag \"${f}\" has no effect if \"motif\" is set."
done
elif use athena || use Xaw3d; then
einfo "Configuring to build with Athena/Lucid toolkit"
myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
else
einfo "Configuring to build with no toolkit"
myconf+=" --with-x-toolkit=no"
fi
elif use aqua; then
einfo "Configuring to build with Nextstep (Cocoa) support"
myconf+=" --with-ns --disable-ns-self-contained"
myconf+=" --without-x"
else
myconf+=" --without-x --without-ns"
fi
# Save version information in the Emacs binary. It will be available
# in variable "system-configuration-options".
myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
if [[ ${PV##*.} = 9999 ]]; then
myconf+=" EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}"
fi
econf \
--program-suffix="-${EMACS_SUFFIX}" \
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
--with-gameuser="${GAMES_USER_DED:-games}" \
--without-compress-install \
--with-file-notification=$(usev gfile || usev inotify || echo no) \
$(use_enable acl) \
$(use_with dbus) \
$(use_with gnutls) \
$(use_with gpm) \
$(use_with hesiod) \
$(use_with kerberos) $(use_with kerberos kerberos5) \
$(use_with libxml2 xml2) \
$(use_with selinux) \
$(use_with wide-int) \
$(use_with zlib) \
${myconf}
}
src_compile() {
export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
emake
}
src_install () {
emake DESTDIR="${D}" NO_BIN_LINK=t install
mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
|| die "moving emacs executable failed"
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
|| die "moving emacs man page failed"
# move info dir to avoid collisions with the dir file generated by portage
mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
|| die "moving info dir failed"
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
# avoid collision between slots, see bug #169033 e.g.
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
rm -rf "${ED}"/usr/share/{applications,icons}
rm -rf "${ED}"/var
# remove unused <version>/site-lisp dir
rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
if use gzip-el; then
# compress .el files when a corresponding .elc exists
find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
assert "gzip .el failed"
fi
local cdir
if use source; then
cdir="/usr/share/emacs/${FULL_VERSION}/src"
insinto "${cdir}"
# This is not meant to install all the source -- just the
# C source you might find via find-function
doins src/*.{c,h,m}
elif has installsources ${FEATURES}; then
cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
fi
sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
X
;;; ${PN}-${SLOT} site-lisp configuration
X
(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
Y (setq find-function-C-source-directory
Y "${EPREFIX}${cdir}")
X (let ((path (getenv "INFOPATH"))
X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
X (and path
X ;; move Emacs Info dir before anything else in /usr/share/info
X (let* ((p (cons nil (split-string path ":" t))) (q p))
X (while (and (cdr q) (not (string-match re (cadr q))))
X (setq q (cdr q)))
X (setcdr q (cons dir (delete dir (cdr q))))
X (setq Info-directory-list (prune-directory-list (cdr p)))))))
EOF
elisp-site-file-install "${T}/${SITEFILE}" || die
dodoc README BUGS
if use aqua; then
dodir /Applications/Gentoo
rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
mv nextstep/Emacs.app \
"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
fi
DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
through the Emacs eselect module, which also redirects man and info
pages. Therefore, several Emacs versions can be installed at the
same time. \"man emacs.eselect\" for details.
\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
strongly recommended that you use app-admin/emacs-updater to rebuild
all byte-compiled elisp files of the installed Emacs packages."
use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
Installing media-fonts/font-adobe-{75,100}dpi on the X server's
machine would satisfy basic Emacs requirements under X11.
See also https://wiki.gentoo.org/wiki/Project:Emacs/Xft_support
for how to enable anti-aliased fonts."
use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
it into /Applications by yourself."
readme.gentoo_create_doc
}
pkg_preinst() {
# move Info dir file to correct name
local infodir=/usr/share/info/${EMACS_SUFFIX} f
if [[ -f ${ED}${infodir}/dir.orig ]]; then
mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
elif [[ -d "${ED}"${infodir} ]]; then
# this should not happen in EAPI 4
ewarn "Regenerating Info directory index in ${infodir} ..."
rm -f "${ED}"${infodir}/dir{,.*}
for f in "${ED}"${infodir}/*; do
if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
install-info --info-dir="${ED}"${infodir} "${f}" \
|| die "install-info failed"
fi
done
fi
}
pkg_postinst() {
elisp-site-regen
local pvr
for pvr in ${REPLACING_VERSIONS}; do
[[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
done
readme.gentoo_print_elog
if use livecd; then
# force an update of the emacs symlink for the livecd/dvd,
# because some microemacs packages set it with USE=livecd
eselect emacs update
elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
# refresh symlinks in case any installed files have changed
eselect emacs set ${EMACS_SUFFIX}
else
eselect emacs update ifunset
fi
}
pkg_postrm() {
elisp-site-regen
eselect emacs update ifunset
}

7
app-editors/emacs-vcs/emacs-vcs-24.3.50_pre20140331.ebuild
Unescape View File

@ -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-editors/emacs-vcs/emacs-vcs-24.3.50_pre20140331.ebuild,v 1.2 2014/04/06 22:13:37 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.50_pre20140331.ebuild,v 1.3 2014/04/12 07:18:41 ulm Exp $
EAPI=5
@ -94,7 +94,10 @@ DEPEND="${RDEPEND}
libxml2? ( virtual/pkgconfig )
X? ( virtual/pkgconfig )
gzip-el? ( app-arch/gzip )
pax_kernel? ( sys-apps/paxctl )"
pax_kernel? (
sys-apps/attr
sys-apps/paxctl
)"
if [[ ${PV##*.} = 9999 ]]; then
DEPEND="${DEPEND}

7
app-editors/emacs-vcs/emacs-vcs-24.3.9999-r1.ebuild
Unescape View File

@ -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-editors/emacs-vcs/emacs-vcs-24.3.9999-r1.ebuild,v 1.2 2014/04/06 22:13:37 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999-r1.ebuild,v 1.3 2014/04/12 07:18:41 ulm Exp $
EAPI=5
@ -92,7 +92,10 @@ DEPEND="${RDEPEND}
libxml2? ( virtual/pkgconfig )
X? ( virtual/pkgconfig )
gzip-el? ( app-arch/gzip )
pax_kernel? ( sys-apps/paxctl )"
pax_kernel? (
sys-apps/attr
sys-apps/paxctl
)"
if [[ ${PV##*.} = 9999 ]]; then
DEPEND="${DEPEND}

7
app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild
Unescape View File

@ -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-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild,v 1.3 2014/04/06 22:13:37 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild,v 1.4 2014/04/12 07:18:41 ulm Exp $
EAPI=5
@ -92,7 +92,10 @@ DEPEND="${RDEPEND}
libxml2? ( virtual/pkgconfig )
X? ( virtual/pkgconfig )
gzip-el? ( app-arch/gzip )
pax_kernel? ( sys-apps/paxctl )"
pax_kernel? (
sys-apps/attr
sys-apps/paxctl
)"
if [[ ${PV##*.} = 9999 ]]; then
DEPEND="${DEPEND}

2
app-editors/gedit-plugins/Manifest
Unescape View File

@ -1,3 +1 @@
DIST gedit-plugins-2.32.0.tar.bz2 616927 SHA256 2ef7bf48e9500556d84ae4c2950f4eadcc3f9cb9c58c90f2c83956b0ddad1107 SHA512 c00535a8a166752ef764319eb79fd7dd5a55df495bf0f3de32e287214f5da8ddd32a52c5538d5e8714843e7e724d24aab9f6fca0f1f339fe299a1ffdf264761b WHIRLPOOL d7385fe3682efaeaa5fbc57a8e8fb68480983140daf78643392b6a7b335a2a5e8ce21cc8f04136efcfac6133dd1c1cd65c50eab0b0cbde766eebb850889796eb
DIST gedit-plugins-3.10.1.tar.xz 1253800 SHA256 b30e30d5a0efb9a711c6583748b37c1ed3e45222505e08f920b78c6de0bc4a9d SHA512 bb63986c1a2c431443191bf1855a54125c9c1b500a4764bf13f597cb8ea09e588ee101d2856938ee229bc9bbba9bd107c60c643fb09f001afa26f0ef90baa2fa WHIRLPOOL d148f654c0b4de0caab3b26ae8334d2ed9344a3b08eed4b45b8458a1f3efd9c909edd8dbf015c951aadaaa0953abe81365324077c81e5d18d1b7c412d148cd46
DIST gedit-plugins-3.8.3.tar.xz 724000 SHA256 2340910ed49acfaab7e8d30142e087f70e55c1a55f8b755d4f9014bce3923c80 SHA512 49a6b6184b73868997477607d932c3ec7b86344854446d1bf7f6a97b2dfff23918970c07fb2bc3f8380ef76874e5addad809c6dd61a0101067e16c9c3c5ea45e WHIRLPOOL b94f8cebd3d4b5e91d92a10b5610510664fb35f4fa8a0eb3dc91f714916b726e6a94a19b13f7072d9df3589241eeff3e8d51dec1090a47a3764ede5c07ce07c8

11
app-editors/gedit-plugins/files/gedit-plugins-3.8.3-terminal-background.patch
Unescape View File

@ -1,11 +0,0 @@
--- plugins/terminal/terminal.py~ 2013-06-18 12:16:09.000000000 +0200
+++ plugins/terminal/terminal.py 2013-10-26 14:49:48.619158171 +0200
@@ -58,8 +58,6 @@
self.system_settings.connect("changed::monospace-font-name", self.font_changed)
self._vte = Vte.Terminal()
- self._vte.set_background_image(None)
- self._vte.set_background_transparent(False)
self.reconfigure_vte()
self._vte.set_size(self._vte.get_column_count(), 5)
self._vte.set_size_request(200, 50)

89
app-editors/gedit-plugins/gedit-plugins-2.32.0.ebuild
Unescape View File

@ -1,89 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/gedit-plugins-2.32.0.ebuild,v 1.8 2012/12/16 21:43:34 tetromino Exp $
EAPI="3"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
PYTHON_DEPEND="python? 2:2.6"
PYTHON_USE_WITH="xml"
PYTHON_USE_WITH_OPT="python"
inherit gnome2 multilib python eutils
DESCRIPTION="Offical plugins for gedit."
HOMEPAGE="http://live.gnome.org/GeditPlugins"
LICENSE="GPL-2+"
KEYWORDS="amd64 x86"
SLOT="0"
IUSE_plugins="charmap synctex terminal"
IUSE="+python ${IUSE_plugins}"
RDEPEND=">=x11-libs/gtk+-2.14:2
gnome-base/gconf
>=x11-libs/gtksourceview-2.6:2.0
>=app-editors/gedit-2.29.3[python]
>=dev-python/pygtk-2.14:2
python? ( >=dev-python/pygtksourceview-2.2:2 )
charmap? ( >=gnome-extra/gucharmap-2.23.0:0 )
synctex? ( >=dev-python/dbus-python-0.82 )
terminal? (
dev-python/gconf-python
>=x11-libs/vte-0.19.4:0[python]
)"
DEPEND="${RDEPEND}
virtual/pkgconfig
dev-util/intltool"
pkg_setup() {
DOCS="AUTHORS NEWS ChangeLog*"
# DEFAULT_PLUGINS from configure.ac
# FIXME: 'taglist' breaks configure
local myplugins="bookmarks,showtabbar,drawspaces,wordcompletion"
# python plugins with no extra dependencies beyond what USE=python brings
use python && myplugins="${myplugins},bracketcompletion,codecomment,colorpicker,commander,joinlines,multiedit,textsize,sessionsaver,smartspaces"
# python plugins with extra dependencies
for plugin in ${IUSE_plugins/+}; do
use ${plugin} || continue
# FIXME: put in REQUIRED_USE when python.eclass supports EAPI4
if use python; then
myplugins="${myplugins},${plugin}"
else
ewarn "Plugin '${plugin}' auto-disabled due to USE=-python"
fi
done
G2CONF="${G2CONF}
--disable-dependency-tracking
--with-plugins=${myplugins}
$(use_enable python)"
python_set_active_version 2
python_pkg_setup
}
src_prepare() {
gnome2_src_prepare
# disable pyc compiling
mv py-compile py-compile.orig
ln -s $(type -P true) py-compile
}
pkg_postinst() {
gnome2_pkg_postinst
if use python; then
python_need_rebuild
python_mod_optimize /usr/$(get_libdir)/gedit-2/plugins
fi
}
pkg_postrm() {
gnome2_pkg_postrm
use python && python_mod_cleanup /usr/$(get_libdir)/gedit-2/plugins
}

7
app-editors/gedit-plugins/gedit-plugins-3.10.1.ebuild
Unescape View File

@ -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-editors/gedit-plugins/gedit-plugins-3.10.1.ebuild,v 1.5 2014/03/09 11:53:36 pacho Exp $
# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/gedit-plugins-3.10.1.ebuild,v 1.6 2014/04/12 10:29:58 pacho Exp $
EAPI="5"
GCONF_DEBUG="no"
@ -11,7 +11,7 @@ PYTHON_REQ_USE="xml"
inherit eutils gnome2 multilib python-r1
DESCRIPTION="Official plugins for gedit"
HOMEPAGE="http://live.gnome.org/GeditPlugins"
HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
LICENSE="GPL-2+"
KEYWORDS="amd64 x86"
@ -68,5 +68,6 @@ src_configure() {
gnome2_src_configure \
--with-plugins=${myplugins} \
$(use_enable python)
$(use_enable python) \
ITSTOOL=$(type -P true)
}

78
app-editors/gedit-plugins/gedit-plugins-3.8.3-r1.ebuild
Unescape View File

@ -1,78 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/gedit-plugins-3.8.3-r1.ebuild,v 1.3 2013/12/08 17:40:21 pacho Exp $
EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes" # plugins are dlopened
PYTHON_COMPAT=( python3_{2,3} )
PYTHON_REQ_USE="xml"
inherit eutils gnome2 multilib python-r1
DESCRIPTION="Official plugins for gedit"
HOMEPAGE="http://live.gnome.org/GeditPlugins"
LICENSE="GPL-2+"
KEYWORDS="amd64 x86"
SLOT="0"
IUSE_plugins="charmap git terminal"
IUSE="+python ${IUSE_plugins}"
REQUIRED_USE="
charmap? ( python )
git? ( python )
terminal? ( python )
python? ( ${REQUIRED_PYTHON_USE} )
"
RDEPEND="
>=app-editors/gedit-3.7.1[python?]
>=dev-libs/glib-2.32:2
>=dev-libs/libpeas-1.7.0[gtk,python?]
>=x11-libs/gtk+-3.4:3
>=x11-libs/gtksourceview-3:3.0
python? (
${PYTHON_DEPS}
>=app-editors/gedit-3[introspection,${PYTHON_USEDEP}]
dev-libs/libpeas[${PYTHON_USEDEP}]
dev-python/dbus-python[${PYTHON_USEDEP}]
dev-python/pycairo
dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
>=x11-libs/gtk+-3.4:3[introspection]
>=x11-libs/gtksourceview-3:3.0[introspection]
x11-libs/pango[introspection]
x11-libs/gdk-pixbuf:2[introspection]
)
charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] )
git? ( >=dev-libs/libgit2-glib-0.0.2 )
terminal? ( x11-libs/vte:2.90[introspection] )
"
DEPEND="${RDEPEND}
>=dev-util/intltool-0.40.0
sys-devel/gettext
virtual/pkgconfig
"
src_prepare() {
# Fix terminal not loading (adapted from 'master')
epatch "${FILESDIR}/${PN}-3.8.3-terminal-background.patch"
gnome2_src_prepare
}
src_configure() {
# DEFAULT_PLUGINS from configure.ac
local myplugins="bookmarks,drawspaces,wordcompletion"
# python plugins with no extra dependencies beyond what USE=python brings
use python && myplugins="${myplugins},bracketcompletion,codecomment,colorpicker,colorschemer,commander,dashboard,joinlines,multiedit,textsize,smartspaces,synctex"
# python plugins with extra dependencies
for plugin in ${IUSE_plugins/+}; do
use ${plugin} && myplugins="${myplugins},${plugin}"
done
gnome2_src_configure \
--with-plugins=${myplugins} \
$(use_enable python)
}

2
app-editors/gedit-plugins/metadata.xml
Unescape View File

@ -7,8 +7,6 @@
<flag name='charmap'>Insert special characters just by clicking on
them</flag>
<flag name='git'>Shows document changes related to git's HEAD</flag>
<flag name='synctex'>Synchronize between LaTeX and PDF with gedit and
evince</flag>
<flag name='terminal'>Embed a terminal in the bottom pane</flag>
</use>
</pkgmetadata>

4
app-emacs/emacs-jabber/emacs-jabber-0.8.92.ebuild
Unescape View File

@ -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-emacs/emacs-jabber/emacs-jabber-0.8.92.ebuild,v 1.1 2014/02/23 08:44:14 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-jabber/emacs-jabber-0.8.92.ebuild,v 1.3 2014/04/12 09:38:06 ago Exp $
EAPI=5
NEED_EMACS=22
@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
DEPEND="app-emacs/hexrgb"
RDEPEND="${DEPEND}"

4
app-emacs/eselect-mode/eselect-mode-1.4.1.ebuild
Unescape View File

@ -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-emacs/eselect-mode/eselect-mode-1.4.1.ebuild,v 1.3 2014/04/02 18:56:50 maekke Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emacs/eselect-mode/eselect-mode-1.4.1.ebuild,v 1.5 2014/04/12 09:38:55 ago Exp $
EAPI=5
@ -13,7 +13,7 @@ SRC_URI="http://dev.gentoo.org/~ulm/eselect/${MY_P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
S="${WORKDIR}/${MY_P}/misc"
SITEFILE="50${PN}-gentoo.el"

4
app-emacs/hexrgb/hexrgb-0_p957.ebuild
Unescape View File

@ -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-emacs/hexrgb/hexrgb-0_p957.ebuild,v 1.1 2014/02/23 08:33:43 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emacs/hexrgb/hexrgb-0_p957.ebuild,v 1.3 2014/04/12 09:38:02 ago Exp $
EAPI=5
@ -12,6 +12,6 @@ SRC_URI="http://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
SITEFILE="50${PN}-gentoo.el"

4
app-emacs/jam-mode/jam-mode-0.3.ebuild
Unescape View File

@ -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-emacs/jam-mode/jam-mode-0.3.ebuild,v 1.1 2014/02/23 12:45:47 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emacs/jam-mode/jam-mode-0.3.ebuild,v 1.3 2014/04/12 09:38:24 ago Exp $
EAPI=5
@ -13,6 +13,6 @@ SRC_URI="http://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~x86"
KEYWORDS="~alpha amd64 x86"
SITEFILE="50${PN}-gentoo.el"

6
app-emacs/yaml-mode/yaml-mode-0.0.9.ebuild
Unescape View File

@ -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/app-emacs/yaml-mode/yaml-mode-0.0.9.ebuild,v 1.1 2013/10/03 14:02:08 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emacs/yaml-mode/yaml-mode-0.0.9.ebuild,v 1.2 2014/04/11 17:32:49 bicatali Exp $
EAPI=5
@ -12,7 +12,7 @@ SRC_URI="https://github.com/yoshiki/${PN}/archive/release-${PV}.tar.gz -> ${P}.t
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
S="${WORKDIR}/${PN}-release-${PV}"
DOCS="README Changes"

1
app-emulation/emul-linux-x86-baselibs/Manifest
Unescape View File

@ -1,2 +1,3 @@
DIST emul-linux-x86-baselibs-20131008.tar.xz 55992196 SHA256 83c077c2d0668502c26abb4c30e1bd9ebd3eb4d2fdb2bab3ec57331a3df2b449 SHA512 4ec890f8bab877a576024c4d932906a486b5d584026c8a89563735d520258dce6a47a47e41ec5cae32be89d697a903844f15b9c2a16338a0d34c4cc46cd781ef WHIRLPOOL 0ec725072c8fbd1b0e8649f715e6a4e26ea9462c9ed290f0f42a5b606cdfa6736f839396ac6a967cfce9c864e5da4cc2082ce2db83cc4a9cb49824e7b975bb20
DIST emul-linux-x86-baselibs-20140406.tar.xz 60312556 SHA256 0f242404c5323c4773cbc1c23abe43cc039b826e431d6b78949a4717af4540e1 SHA512 61450a5f9a63458c29e7e0421e77ca6ef25dc50355678a9e0dee1eb50ca23869790e1293ad130ee363be0b19592d735045c8e4a542bcb76a212c68ecdee9382e WHIRLPOOL e00ccbb07a9875dedd25033246fb9367a2610dc2b11541501777270ec00e1ceab880f4f351f2a63663917312699b73626776005584b556935d51716a982a2aa3
DIST openssl-1.0.1g.tbz2 2665025 SHA256 77e32cb1e9874a09a32c1a9ff87512d462a8870f9dae50c6cd44a0a1f50405d1 SHA512 36e808695b189f118b8e788fa84a68ce0b5e02fd9bb62a2b2efba8cd6de953b7129075b4adc716b5211ee9486e36977b5aa65676dea640c3d2ed4e9fd0d24aa7 WHIRLPOOL 223cac5bc0ccbc685fca610c3823cbf2f074c9976b2fc2212beac2c605f614bb5bfb6cf5426bb3547150afc46315b2633924c1f627c06e475b65b7bcab1e9154

91
app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r1.ebuild
Unescape View File

@ -0,0 +1,91 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r1.ebuild,v 1.2 2014/04/12 08:34:06 pacho Exp $
EAPI=5
inherit emul-linux-x86
LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP
Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff
openssl tcp_wrappers_license"
KEYWORDS="-* ~amd64"
IUSE="abi_x86_32"
SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/emul/openssl-1.0.1g.tbz2"
DEPEND=""
RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
abi_x86_32? (
>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
>=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)]
>=dev-libs/udis86-1.7-r2[abi_x86_32(-)]
>=virtual/libffi-3.0.13-r1[abi_x86_32(-)]
>=sys-devel/llvm-3.3-r1[abi_x86_32(-)]
>=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)]
virtual/jpeg:62[abi_x86_32(-)]
>=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)]
>=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)]
>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
>=virtual/libusb-0-r1:0[abi_x86_32(-)]
>=virtual/libusb-1-r1:1[abi_x86_32(-)]
|| (
>=virtual/udev-206-r1[abi_x86_32(-)]
~virtual/udev-204[abi_x86_32(-)] )
>=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)]
>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
>=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)]
>=media-libs/lcms-2.5-r1:2[abi_x86_32(-)]
>=app-text/libpaper-1.1.24-r2[abi_x86_32(-)]
>=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)]
|| (
>=dev-libs/elfutils-0.155-r1[abi_x86_32(-)]
>=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)]
)
>=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)]
>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
>=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)]
>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)]
>=dev-libs/libpcre-8.33-r1[abi_x86_32(-)]
>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
>=sys-libs/gdbm-1.10-r1[abi_x86_32(-)]
>=dev-libs/json-c-0.11-r1[abi_x86_32(-)]
>=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)]
>=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)]
>=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)]
>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
>=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)]
>=dev-db/sqlite-3.8.3:3[abi_x86_32(-)]
>=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)]
>=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)]
dev-libs/libgcrypt:11[abi_x86_32(-)]
>=dev-libs/libgcrypt-1.6.1-r1:0[abi_x86_32(-)]
>=dev-libs/lzo-2.06-r1[abi_x86_32(-)]
>=dev-libs/libxslt-1.1.28-r2[abi_x86_32(-)]
>=sys-apps/file-5.18-r1[abi_x86_32(-)]
)
>=sys-libs/glibc-2.15" # bug 340613
PYTHON_UPDATER_IGNORE="1"
src_prepare() {
export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
emul-linux-x86_src_prepare
rm -rf "${S}/etc/env.d/binutils/" \
"${S}/usr/i686-pc-linux-gnu/lib" \
"${S}/usr/lib32/engines/" \
"${S}/usr/lib32/openldap/" || die
ln -s ../share/terminfo "${S}/usr/lib32/terminfo" || die
# Remove migrated stuff.
use abi_x86_32 && rm -f $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
}
src_install() {
emul-linux-x86_src_install
rm -rf "${ED}"/usr/include # needed for openssl tbz2
}

289
app-emulation/emul-linux-x86-baselibs/files/remove-native-20140406
Unescape View File

@ -0,0 +1,289 @@
lib32/libz.so.1
lib32/libz.so.1.2.8
usr/lib32/libz.so
usr/lib32/pkgconfig/zlib.pc
usr/lib32/libminizip.so
usr/lib32/libminizip.so.1
usr/lib32/libminizip.so.1.0.0
usr/lib32/pkgconfig/minizip.pc
lib32/libbz2.so.1
lib32/libbz2.so.1.0
lib32/libbz2.so.1.0.6
usr/lib32/libbz2.so
usr/lib32/libpng.so
usr/lib32/libpng16.so
usr/lib32/libpng16.so.16
usr/lib32/libpng16.so.16.8.0
usr/lib32/pkgconfig/libpng.pc
usr/lib32/pkgconfig/libpng16.pc
usr/lib32/libudis86.so
usr/lib32/libudis86.so.0
usr/lib32/libudis86.so.0.0.0
usr/lib32/libffi-3.0.13/include/ffi.h
usr/lib32/libffi-3.0.13/include/ffitarget.h
usr/lib32/libffi.so
usr/lib32/libffi.so.6
usr/lib32/libffi.so.6.0.1
usr/lib32/pkgconfig/libffi.pc
usr/lib32/LLVMHello.so
usr/lib32/libLLVM-3.3.so
usr/lib32/libLTO.so
usr/lib32/libprofile_rt.so
usr/lib32/libpng12.so.0
usr/lib32/libraw1394.so
usr/lib32/libraw1394.so.11
usr/lib32/libraw1394.so.11.1.0
usr/lib32/pkgconfig/libraw1394.pc
usr/lib32/libavc1394.so
usr/lib32/libavc1394.so.0
usr/lib32/libavc1394.so.0.3.0
usr/lib32/pkgconfig/libavc1394.pc
usr/lib32/librom1394.so
usr/lib32/librom1394.so.0
usr/lib32/librom1394.so.0.3.0
usr/lib32/libjpeg.so
usr/lib32/libturbojpeg.so
usr/lib32/libjpeg.so.62
usr/lib32/libexpat.so
usr/lib32/libexpat.so.1
usr/lib32/libexpat.so.1.6.0
usr/lib32/libexpatu.so
usr/lib32/libexpatu.so.1
usr/lib32/libexpatu.so.1.6.0
usr/lib32/libexpatw.so
usr/lib32/libexpatw.so.1
usr/lib32/libexpatw.so.1.6.0
usr/lib32/pkgconfig/expat.pc
usr/lib32/pkgconfig/expatu.pc
usr/lib32/pkgconfig/expatw.pc
lib32/libusb-0.1.so.4
lib32/libusb-0.1.so.4.4.4
usr/lib32/libusb-1.0.so
lib32/libusb-1.0.so.0
lib32/libusb-1.0.so.0.1.0
usr/lib32/libusb.so
usr/lib32/pkgconfig/libusb-1.0.pc
usr/lib32/pkgconfig/libusb.pc
lib32/libudev.so.1
lib32/libudev.so.1.4.0
usr/lib32/libudev.so
usr/lib32/pkgconfig/libudev.pc
usr/lib32/libjpeg.so.62.1.0
usr/lib32/libtiff.so
usr/lib32/libtiff.so.5
usr/lib32/libtiff.so.5.2.0
usr/lib32/libtiffxx.so
usr/lib32/libtiffxx.so.5
usr/lib32/libtiffxx.so.5.2.0
usr/lib32/pkgconfig/libtiff-4.pc
lib32/libattr.so.1
lib32/libattr.so.1.1.0
usr/lib32/libattr.so
usr/lib32/glib-2.0/include/glibconfig.h
usr/lib32/libglib-2.0.so
usr/lib32/libglib-2.0.so.0
usr/lib32/libglib-2.0.so.0.3800.2
usr/lib32/pkgconfig/glib-2.0.pc
usr/lib32/libgmodule-2.0.so
usr/lib32/libgmodule-2.0.so.0
usr/lib32/libgmodule-2.0.so.0.3800.2
usr/lib32/pkgconfig/gmodule-2.0.pc
usr/lib32/libgio-2.0.so
usr/lib32/libgio-2.0.so.0
usr/lib32/libgio-2.0.so.0.3800.2
usr/lib32/pkgconfig/gio-2.0.pc
usr/lib32/libgobject-2.0.so
usr/lib32/libgobject-2.0.so.0
usr/lib32/libgobject-2.0.so.0.3800.2
usr/lib32/pkgconfig/gobject-2.0.pc
usr/lib32/libgthread-2.0.so
usr/lib32/libgthread-2.0.so.0
usr/lib32/libgthread-2.0.so.0.3800.2
usr/lib32/pkgconfig/gthread-2.0.pc
usr/lib32/pkgconfig/gio-unix-2.0.pc
usr/lib32/pkgconfig/gmodule-export-2.0.pc
usr/lib32/pkgconfig/gmodule-no-export-2.0.pc
usr/lib32/liblcms2.so
usr/lib32/liblcms2.so.2
usr/lib32/liblcms2.so.2.0.5
usr/lib32/pkgconfig/lcms2.pc
usr/lib32/libpaper.so
usr/lib32/libpaper.so.1
usr/lib32/libpaper.so.1.1.2
usr/lib32/libtiff.so.3
usr/lib32/libtiff.so.4
usr/lib32/libtiffxx.so.3
usr/lib32/libtiffxx.so.4
usr/lib32/elfutils/libebl_aarch64-0.158.so
usr/lib32/elfutils/libebl_aarch64.so
usr/lib32/elfutils/libebl_alpha-0.158.so
usr/lib32/elfutils/libebl_alpha.so
usr/lib32/elfutils/libebl_arm-0.158.so
usr/lib32/elfutils/libebl_arm.so
usr/lib32/elfutils/libebl_i386-0.158.so
usr/lib32/elfutils/libebl_i386.so
usr/lib32/elfutils/libebl_ia64-0.158.so
usr/lib32/elfutils/libebl_ia64.so
usr/lib32/elfutils/libebl_ppc-0.158.so
usr/lib32/elfutils/libebl_ppc.so
usr/lib32/elfutils/libebl_ppc64-0.158.so
usr/lib32/elfutils/libebl_ppc64.so
usr/lib32/elfutils/libebl_s390-0.158.so
usr/lib32/elfutils/libebl_s390.so
usr/lib32/elfutils/libebl_sh-0.158.so
usr/lib32/elfutils/libebl_sh.so
usr/lib32/elfutils/libebl_sparc-0.158.so
usr/lib32/elfutils/libebl_sparc.so
usr/lib32/elfutils/libebl_tilegx-0.158.so
usr/lib32/elfutils/libebl_tilegx.so
usr/lib32/elfutils/libebl_x86_64-0.158.so
usr/lib32/elfutils/libebl_x86_64.so
usr/lib32/libelf-0.158.so
usr/lib32/libelf.so
usr/lib32/libelf.so.1
usr/lib32/libasm-0.158.so
usr/lib32/libasm.so
usr/lib32/libasm.so.1
usr/lib32/libdw-0.158.so
usr/lib32/libdw.so
usr/lib32/libdw.so.1
lib32/libss.so.2
lib32/libss.so.2.0
usr/lib32/libss.so
usr/lib32/pkgconfig/ss.pc
lib32/libcom_err.so.2
lib32/libcom_err.so.2.1
usr/lib32/libcom_err.so
usr/lib32/pkgconfig/com_err.pc
usr/lib32/libcurses.so
usr/lib32/libform.so
usr/lib32/libform.so.5
usr/lib32/libform.so.5.9
usr/lib32/libformw.so
usr/lib32/libformw.so.5
usr/lib32/libformw.so.5.9
usr/lib32/libmenu.so
usr/lib32/libmenu.so.5
usr/lib32/libmenu.so.5.9
usr/lib32/libmenuw.so
usr/lib32/libmenuw.so.5
usr/lib32/libmenuw.so.5.9
lib32/libncurses.so.5
lib32/libncurses.so.5.9
lib32/libncursesw.so.5
lib32/libncursesw.so.5.9
usr/lib32/libncurses.so
usr/lib32/libncursesw.so
usr/lib32/libpanel.so
usr/lib32/libpanel.so.5
usr/lib32/libpanel.so.5.9
usr/lib32/libpanelw.so
usr/lib32/libpanelw.so.5
usr/lib32/libpanelw.so.5.9
usr/lib32/pkgconfig/form.pc
usr/lib32/pkgconfig/formw.pc
usr/lib32/pkgconfig/ncurses++.pc
usr/lib32/pkgconfig/ncurses++w.pc
usr/lib32/pkgconfig/menuw.pc
usr/lib32/pkgconfig/menu.pc
usr/lib32/pkgconfig/ncurses.pc
usr/lib32/pkgconfig/ncursesw.pc
usr/lib32/pkgconfig/panel.pc
usr/lib32/pkgconfig/panelw.pc
usr/lib32/terminfo
lib32/libgpm.so.1
lib32/libgpm.so.1.20.0
usr/lib32/libgpm.so
usr/lib32/libgmp.so
usr/lib32/libgmp.so.10
usr/lib32/libgmp.so.10.1.2
usr/lib32/libgmpxx.so
usr/lib32/libgmpxx.so.4
usr/lib32/libgmpxx.so.4.3.2
lib32/libpcre.so.1
lib32/libpcre.so.1.2.1
usr/lib32/libpcre.so
usr/lib32/libpcrecpp.so
usr/lib32/libpcrecpp.so.0
usr/lib32/libpcrecpp.so.0.0.0
usr/lib32/libpcreposix.so
usr/lib32/libpcreposix.so.0
usr/lib32/libpcreposix.so.0.0.2
usr/lib32/pkgconfig/libpcre.pc
usr/lib32/pkgconfig/libpcrecpp.pc
usr/lib32/pkgconfig/libpcreposix.pc
usr/lib32/dbus-1.0/include/dbus/dbus-arch-deps.h
usr/lib32/libdbus-1.so
usr/lib32/libdbus-1.so.3
usr/lib32/libdbus-1.so.3.7.6
usr/lib32/pkgconfig/dbus-1.pc
lib32/libwrap.so.0
lib32/libwrap.so.0.7.6
usr/lib32/libwrap.so
usr/lib32/libgdbm.so
usr/lib32/libgdbm_compat.so
usr/lib32/libjson-c.so
usr/lib32/libjson-c.so.2
usr/lib32/libjson-c.so.2.0.1
usr/lib32/pkgconfig/json-c.pc
usr/lib32/libxml2.so
usr/lib32/libxml2.so.2
usr/lib32/libxml2.so.2.9.1
usr/lib32/pkgconfig/libxml-2.0.pc
usr/lib32/libdbus-glib-1.so
usr/lib32/libdbus-glib-1.so.2
usr/lib32/libdbus-glib-1.so.2.2.2
usr/lib32/pkgconfig/dbus-glib-1.pc
lib32/libreadline.so.6
lib32/libreadline.so.6.2
usr/lib32/libreadline.so
lib32/libhistory.so.6
lib32/libhistory.so.6.2
usr/lib32/libhistory.so
usr/lib32/libmng.so
usr/lib32/libmng.so.1
usr/lib32/libmng.so.1.0.0
usr/lib32/libasprintf.so
usr/lib32/libasprintf.so.0
usr/lib32/libasprintf.so.0.0.0
usr/lib32/libgpg-error.so
usr/lib32/libgpg-error.so.0
usr/lib32/libgpg-error.so.0.10.0
usr/lib32/libsqlite3.so
usr/lib32/libsqlite3.so.0
usr/lib32/libsqlite3.so.0.8.6
usr/lib32/pkgconfig/sqlite3.pc
usr/lib32/libnettle.so
usr/lib32/libnettle.so.4
usr/lib32/libnettle.so.4.7
usr/lib32/pkgconfig/nettle.pc
usr/lib32/libhogweed.so
usr/lib32/libhogweed.so.2
usr/lib32/libhogweed.so.2.5
usr/lib32/pkgconfig/hogweed.pc
usr/lib32/libtasn1.so
# Uncomment when gnutls is converted to multilib; bug #493166
# usr/lib32/libtasn1.so.3
# usr/lib32/libtasn1.so.3.2.0
usr/lib32/pkgconfig/libtasn1.pc
usr/lib32/libgcrypt.so
usr/lib32/libgcrypt.so.11
usr/lib32/libgcrypt.so.11.8.2
usr/lib32/liblzo2.so
usr/lib32/liblzo2.so.2
usr/lib32/liblzo2.so.2.0.0
usr/lib32/libxslt.so
usr/lib32/libxslt.so.1
usr/lib32/libxslt.so.1.1.28
usr/lib32/libexslt.so
usr/lib32/libexslt.so.0
usr/lib32/libexslt.so.0.8.17
usr/lib32/pkgconfig/libxslt.pc
usr/lib32/pkgconfig/libexslt.pc
usr/lib32/libmagic.so
usr/lib32/libmagic.so.1
usr/lib32/libmagic.so.1.0.0
lib32/liblzma.so.5
lib32/liblzma.so.5.0.5
usr/lib32/liblzma.so
usr/lib32/pkgconfig/liblzma.pc

4
app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140406.ebuild
Unescape View File

@ -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-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140406.ebuild,v 1.1 2014/04/06 09:12:52 pacho Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140406.ebuild,v 1.2 2014/04/12 08:38:30 pacho Exp $
EAPI=5
inherit emul-linux-x86
@ -61,5 +61,5 @@ src_prepare() {
fi
# Remove migrated stuff.
use abi_x86_32 && rm -f $(cat "${FILESDIR}/remove-native")
use abi_x86_32 && rm -f $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
}

318
app-emulation/emul-linux-x86-soundlibs/files/remove-native-20140406
Unescape View File

@ -0,0 +1,318 @@
usr/lib32/pkgconfig/ogg.pc
usr/lib32/libogg.so
usr/lib32/libogg.so.0
usr/lib32/libogg.so.0.8.1
usr/lib32/libmodplug.so
usr/lib32/libmodplug.so.1
usr/lib32/libmodplug.so.1.0.0
usr/lib32/pkgconfig/libmodplug.pc
usr/lib32/libgsm.so
usr/lib32/libgsm.so.1
usr/lib32/libgsm.so.1.0.13
usr/lib32/libvorbis.so
usr/lib32/libvorbis.so.0
usr/lib32/libvorbis.so.0.4.6
usr/lib32/libvorbisenc.so
usr/lib32/libvorbisenc.so.2
usr/lib32/libvorbisenc.so.2.0.9
usr/lib32/libvorbisfile.so
usr/lib32/libvorbisfile.so.3
usr/lib32/libvorbisfile.so.3.3.5
usr/lib32/pkgconfig/vorbis.pc
usr/lib32/pkgconfig/vorbisenc.pc
usr/lib32/pkgconfig/vorbisfile.pc
usr/lib32/libwebrtc_audio_processing.so
usr/lib32/libwebrtc_audio_processing.so.0
usr/lib32/libwebrtc_audio_processing.so.0.0.0
usr/lib32/pkgconfig/webrtc-audio-processing.pc
usr/lib32/libasound.so
usr/lib32/libasound.so.2
usr/lib32/libasound.so.2.0.0
usr/lib32/pkgconfig/alsa.pc
usr/lib32/alsa-lib/smixer/smixer-ac97.so
usr/lib32/alsa-lib/smixer/smixer-hda.so
usr/lib32/alsa-lib/smixer/smixer-sbase.so
usr/lib32/libFLAC++.so
usr/lib32/libFLAC++.so.6
usr/lib32/libFLAC++.so.6.2.0
usr/lib32/libFLAC.so
usr/lib32/libFLAC.so.8
usr/lib32/libFLAC.so.8.2.0
usr/lib32/pkgconfig/flac++.pc
usr/lib32/pkgconfig/flac.pc
usr/lib32/libaudiofile.so
usr/lib32/libaudiofile.so.1
usr/lib32/libaudiofile.so.1.0.0
usr/lib32/pkgconfig/audiofile.pc
usr/lib32/libfftw3.so
usr/lib32/libfftw3.so.3
usr/lib32/libfftw3.so.3.3.2
usr/lib32/libfftw3f.so
usr/lib32/libfftw3f.so.3
usr/lib32/libfftw3f.so.3.3.2
usr/lib32/libfftw3l.so
usr/lib32/libfftw3l.so.3
usr/lib32/libfftw3l.so.3.3.2
usr/lib32/pkgconfig/fftw3.pc
usr/lib32/pkgconfig/fftw3f.pc
usr/lib32/pkgconfig/fftw3l.pc
usr/lib32/ladspa/alias_1407.so
usr/lib32/ladspa/allpass_1895.so
usr/lib32/ladspa/am_pitchshift_1433.so
usr/lib32/ladspa/amp.so
usr/lib32/ladspa/amp_1181.so
usr/lib32/ladspa/analogue_osc_1416.so
usr/lib32/ladspa/bandpass_a_iir_1893.so
usr/lib32/ladspa/bandpass_iir_1892.so
usr/lib32/ladspa/bode_shifter_1431.so
usr/lib32/ladspa/bode_shifter_cv_1432.so
usr/lib32/ladspa/butterworth_1902.so
usr/lib32/ladspa/caps.so
usr/lib32/ladspa/chebstortion_1430.so
usr/lib32/ladspa/comb_1190.so
usr/lib32/ladspa/comb_1887.so
usr/lib32/ladspa/comb_splitter_1411.so
usr/lib32/ladspa/const_1909.so
usr/lib32/ladspa/crossover_dist_1404.so
usr/lib32/ladspa/dc_remove_1207.so
usr/lib32/ladspa/decay_1886.so
usr/lib32/ladspa/decimator_1202.so
usr/lib32/ladspa/declip_1195.so
usr/lib32/ladspa/delay.so
usr/lib32/ladspa/delay_1898.so
usr/lib32/ladspa/delayorama_1402.so
usr/lib32/ladspa/diode_1185.so
usr/lib32/ladspa/divider_1186.so
usr/lib32/ladspa/dj_eq_1901.so
usr/lib32/ladspa/dj_flanger_1438.so
usr/lib32/ladspa/dyson_compress_1403.so
usr/lib32/ladspa/fad_delay_1192.so
usr/lib32/ladspa/fast_lookahead_limiter_1913.so
usr/lib32/ladspa/filter.so
usr/lib32/ladspa/flanger_1191.so
usr/lib32/ladspa/fm_osc_1415.so
usr/lib32/ladspa/foldover_1213.so
usr/lib32/ladspa/foverdrive_1196.so
usr/lib32/ladspa/freq_tracker_1418.so
usr/lib32/ladspa/gate_1410.so
usr/lib32/ladspa/giant_flange_1437.so
usr/lib32/ladspa/gong_1424.so
usr/lib32/ladspa/gong_beater_1439.so
usr/lib32/ladspa/gsm_1215.so
usr/lib32/ladspa/gverb_1216.so
usr/lib32/ladspa/hard_limiter_1413.so
usr/lib32/ladspa/harmonic_gen_1220.so
usr/lib32/ladspa/hermes_filter_1200.so
usr/lib32/ladspa/highpass_iir_1890.so
usr/lib32/ladspa/hilbert_1440.so
usr/lib32/ladspa/imp_1199.so
usr/lib32/ladspa/impulse_1885.so
usr/lib32/ladspa/inv_1429.so
usr/lib32/ladspa/karaoke_1409.so
usr/lib32/ladspa/latency_1914.so
usr/lib32/ladspa/lcr_delay_1436.so
usr/lib32/ladspa/lowpass_iir_1891.so
usr/lib32/ladspa/ls_filter_1908.so
usr/lib32/ladspa/matrix_ms_st_1421.so
usr/lib32/ladspa/matrix_spatialiser_1422.so
usr/lib32/ladspa/matrix_st_ms_1420.so
usr/lib32/ladspa/mbeq_1197.so
usr/lib32/ladspa/mod_delay_1419.so
usr/lib32/ladspa/multivoice_chorus_1201.so
usr/lib32/ladspa/noise.so
usr/lib32/ladspa/notch_iir_1894.so
usr/lib32/ladspa/phasers_1217.so
usr/lib32/ladspa/pitch_scale_1193.so
usr/lib32/ladspa/pitch_scale_1194.so
usr/lib32/ladspa/plate_1423.so
usr/lib32/ladspa/pointer_cast_1910.so
usr/lib32/ladspa/rate_shifter_1417.so
usr/lib32/ladspa/retro_flange_1208.so
usr/lib32/ladspa/revdelay_1605.so
usr/lib32/ladspa/ringmod_1188.so
usr/lib32/ladspa/satan_maximiser_1408.so
usr/lib32/ladspa/sc1_1425.so
usr/lib32/ladspa/sc2_1426.so
usr/lib32/ladspa/sc3_1427.so
usr/lib32/ladspa/sc4_1882.so
usr/lib32/ladspa/sc4m_1916.so
usr/lib32/ladspa/se4_1883.so
usr/lib32/ladspa/shaper_1187.so
usr/lib32/ladspa/sifter_1210.so
usr/lib32/ladspa/sin_cos_1881.so
usr/lib32/ladspa/sine.so
usr/lib32/ladspa/single_para_1203.so
usr/lib32/ladspa/sinus_wavewrapper_1198.so
usr/lib32/ladspa/smooth_decimate_1414.so
usr/lib32/ladspa/split_1406.so
usr/lib32/ladspa/step_muxer_1212.so
usr/lib32/ladspa/surround_encoder_1401.so
usr/lib32/ladspa/svf_1214.so
usr/lib32/ladspa/tape_delay_1211.so
usr/lib32/ladspa/transient_1206.so
usr/lib32/ladspa/triple_para_1204.so
usr/lib32/ladspa/valve_1209.so
usr/lib32/ladspa/valve_rect_1405.so
usr/lib32/ladspa/vynil_1905.so
usr/lib32/ladspa/wave_terrain_1412.so
usr/lib32/ladspa/xfade_1915.so
usr/lib32/ladspa/zm1_1428.so
usr/lib32/libmikmod.so
usr/lib32/libmikmod.so.2
usr/lib32/libmikmod.so.3
usr/lib32/libmikmod.so.3.0.0
usr/lib32/pkgconfig/libmikmod.pc
usr/lib32/alsa-lib/libasound_module_ctl_equal.so
usr/lib32/alsa-lib/libasound_module_pcm_equal.so
usr/lib32/libcdda_interface.so
usr/lib32/libcdda_interface.so.0
usr/lib32/libcdda_interface.so.0.10.2
usr/lib32/libcdda_paranoia.so
usr/lib32/libcdda_paranoia.so.0
usr/lib32/libcdda_paranoia.so.0.10.2
usr/lib32/libwavpack.so
usr/lib32/libwavpack.so.1
usr/lib32/libwavpack.so.1.1.4
usr/lib32/pkgconfig/wavpack.pc
usr/lib32/libmpcdec.so
usr/lib32/libmpcdec.so.7
usr/lib32/libmpcdec.so.7.0.1
usr/lib32/libsndfile.so
usr/lib32/libsndfile.so.1
usr/lib32/libsndfile.so.1.0.25
usr/lib32/pkgconfig/sndfile.pc
usr/lib32/libsamplerate.so
usr/lib32/libsamplerate.so.0
usr/lib32/libsamplerate.so.0.1.7
usr/lib32/pkgconfig/samplerate.pc
usr/lib32/libtwolame.so
usr/lib32/libtwolame.so.0
usr/lib32/libtwolame.so.0.0.0
usr/lib32/pkgconfig/twolame.pc
usr/lib32/jack/a2j_in.so
usr/lib32/jack/inprocess.so
usr/lib32/jack/intime.so
usr/lib32/jack/jack_alsa.so
usr/lib32/jack/jack_alsa_midi.so
usr/lib32/jack/jack_dummy.so
usr/lib32/jack/jack_net.so
usr/lib32/jack/jack_oss.so
usr/lib32/libjack.so
usr/lib32/libjack.so.0
usr/lib32/libjack.so.0.0.28
usr/lib32/libjackserver.so
usr/lib32/libjackserver.so.0
usr/lib32/libjackserver.so.0.0.28
usr/lib32/pkgconfig/jack.pc
usr/lib32/libportaudio.so
usr/lib32/libportaudio.so.2
usr/lib32/libportaudio.so.2.0.0
usr/lib32/libportaudiocpp.so
usr/lib32/libportaudiocpp.so.0
usr/lib32/libportaudiocpp.so.0.0.12
usr/lib32/pkgconfig/portaudio-2.0.pc
usr/lib32/pkgconfig/portaudiocpp.pc
usr/lib32/libmpg123.so
usr/lib32/libmpg123.so.0
usr/lib32/libmpg123.so.0.37.5
usr/lib32/mpg123/output_alsa.so
usr/lib32/mpg123/output_dummy.so
usr/lib32/mpg123/output_jack.so
usr/lib32/mpg123/output_oss.so
usr/lib32/mpg123/output_portaudio.so
usr/lib32/mpg123/output_pulse.so
usr/lib32/pkgconfig/libmpg123.pc
usr/lib32/libpulse-mainloop-glib.so
usr/lib32/libpulse-mainloop-glib.so.0
usr/lib32/libpulse-mainloop-glib.so.0.0.5
usr/lib32/libpulse-simple.so
usr/lib32/libpulse-simple.so.0
usr/lib32/libpulse-simple.so.0.1.0
usr/lib32/libpulse.so
usr/lib32/libpulse.so.0
usr/lib32/libpulse.so.0.17.3
usr/lib32/libpulsecore-5.0.so
usr/lib32/pkgconfig/libpulse-mainloop-glib.pc
usr/lib32/pkgconfig/libpulse-simple.pc
usr/lib32/pkgconfig/libpulse.pc
usr/lib32/pulse-5.0/modules/libalsa-util.so
usr/lib32/pulse-5.0/modules/libcli.so
usr/lib32/pulse-5.0/modules/libprotocol-cli.so
usr/lib32/pulse-5.0/modules/libprotocol-http.so
usr/lib32/pulse-5.0/modules/libprotocol-native.so
usr/lib32/pulse-5.0/modules/libprotocol-simple.so
usr/lib32/pulse-5.0/modules/libraop.so
usr/lib32/pulse-5.0/modules/librtp.so
usr/lib32/pulse-5.0/modules/libwebrtc-util.so
usr/lib32/pulse-5.0/modules/module-alsa-card.so
usr/lib32/pulse-5.0/modules/module-alsa-sink.so
usr/lib32/pulse-5.0/modules/module-alsa-source.so
usr/lib32/pulse-5.0/modules/module-always-sink.so
usr/lib32/pulse-5.0/modules/module-augment-properties.so
usr/lib32/pulse-5.0/modules/module-card-restore.so
usr/lib32/pulse-5.0/modules/module-cli-protocol-tcp.so
usr/lib32/pulse-5.0/modules/module-cli-protocol-unix.so
usr/lib32/pulse-5.0/modules/module-cli.so
usr/lib32/pulse-5.0/modules/module-combine-sink.so
usr/lib32/pulse-5.0/modules/module-combine.so
usr/lib32/pulse-5.0/modules/module-default-device-restore.so
usr/lib32/pulse-5.0/modules/module-detect.so
usr/lib32/pulse-5.0/modules/module-device-manager.so
usr/lib32/pulse-5.0/modules/module-device-restore.so
usr/lib32/pulse-5.0/modules/module-echo-cancel.so
usr/lib32/pulse-5.0/modules/module-filter-apply.so
usr/lib32/pulse-5.0/modules/module-filter-heuristics.so
usr/lib32/pulse-5.0/modules/module-http-protocol-tcp.so
usr/lib32/pulse-5.0/modules/module-http-protocol-unix.so
usr/lib32/pulse-5.0/modules/module-intended-roles.so
usr/lib32/pulse-5.0/modules/module-jack-sink.so
usr/lib32/pulse-5.0/modules/module-jack-source.so
usr/lib32/pulse-5.0/modules/module-ladspa-sink.so
usr/lib32/pulse-5.0/modules/module-loopback.so
usr/lib32/pulse-5.0/modules/module-match.so
usr/lib32/pulse-5.0/modules/module-mmkbd-evdev.so
usr/lib32/pulse-5.0/modules/module-native-protocol-fd.so
usr/lib32/pulse-5.0/modules/module-native-protocol-tcp.so
usr/lib32/pulse-5.0/modules/module-native-protocol-unix.so
usr/lib32/pulse-5.0/modules/module-null-sink.so
usr/lib32/pulse-5.0/modules/module-null-source.so
usr/lib32/pulse-5.0/modules/module-pipe-sink.so
usr/lib32/pulse-5.0/modules/module-pipe-source.so
usr/lib32/pulse-5.0/modules/module-position-event-sounds.so
usr/lib32/pulse-5.0/modules/module-raop-sink.so
usr/lib32/pulse-5.0/modules/module-remap-sink.so
usr/lib32/pulse-5.0/modules/module-remap-source.so
usr/lib32/pulse-5.0/modules/module-rescue-streams.so
usr/lib32/pulse-5.0/modules/module-role-cork.so
usr/lib32/pulse-5.0/modules/module-role-ducking.so
usr/lib32/pulse-5.0/modules/module-rtp-recv.so
usr/lib32/pulse-5.0/modules/module-rtp-send.so
usr/lib32/pulse-5.0/modules/module-simple-protocol-tcp.so
usr/lib32/pulse-5.0/modules/module-simple-protocol-unix.so
usr/lib32/pulse-5.0/modules/module-sine-source.so
usr/lib32/pulse-5.0/modules/module-sine.so
usr/lib32/pulse-5.0/modules/module-stream-restore.so
usr/lib32/pulse-5.0/modules/module-suspend-on-idle.so
usr/lib32/pulse-5.0/modules/module-switch-on-connect.so
usr/lib32/pulse-5.0/modules/module-switch-on-port-available.so
usr/lib32/pulse-5.0/modules/module-tunnel-sink-new.so
usr/lib32/pulse-5.0/modules/module-tunnel-sink.so
usr/lib32/pulse-5.0/modules/module-tunnel-source-new.so
usr/lib32/pulse-5.0/modules/module-tunnel-source.so
usr/lib32/pulse-5.0/modules/module-virtual-sink.so
usr/lib32/pulse-5.0/modules/module-virtual-source.so
usr/lib32/pulse-5.0/modules/module-virtual-surround-sink.so
usr/lib32/pulse-5.0/modules/module-volume-restore.so
usr/lib32/pulse-5.0/modules/module-x11-bell.so
usr/lib32/pulse-5.0/modules/module-x11-cork-request.so
usr/lib32/pulse-5.0/modules/module-x11-publish.so
usr/lib32/pulse-5.0/modules/module-x11-xsmp.so
usr/lib32/pulseaudio/libpulsecommon-5.0.so
usr/lib32/pulseaudio/libpulsedsp.so
usr/lib32/ao/plugins-4/libalsa.so
usr/lib32/ao/plugins-4/liboss.so
usr/lib32/ao/plugins-4/libpulse.so
usr/lib32/libao.so
usr/lib32/libao.so.4
usr/lib32/libao.so.4.0.0
usr/lib32/pkgconfig/ao.pc

6
app-emulation/rex-client/rex-client-9999.ebuild
Unescape View File

@ -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-emulation/rex-client/rex-client-9999.ebuild,v 1.2 2014/04/11 05:27:35 mduft Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/rex-client/rex-client-9999.ebuild,v 1.3 2014/04/11 09:21:35 patrick Exp $
EAPI="4"
@ -29,13 +29,11 @@ src_prepare() {
}
src_install() {
cd ${S}
exeinto /usr/bin
for x in ${REX_EXE[@]}; do
doexe ${S}/${x}
doexe "${S}"/${x}
done
insinto /etc
newins client/rex-config.sh rex.conf
}

3
app-emulation/xen-tools/Manifest
Unescape View File

@ -2,7 +2,10 @@ DIST ipxe.tar.gz 2867999 SHA256 632ce8c193ccacc3012bd354bdb733a4be126f7c098e1119
DIST seabios-dir-remote-20130720.tar.gz 3201017 SHA256 0cf06b54e8ae1cfc25f2942eea1490a9e7e01f478541577025f6eef76e0c76de SHA512 e9ebe3711e3f678d3632f8e8e645f8be4fb65608aff04aeeb0e1152521bf571bc4d879f136d23bb0aa8bd4c4ec20f294b472cf54dc70916e52d330328aadd357 WHIRLPOOL 6138271f72fd96fabe3cffc07a6efcb9c0e195ed96f4ad708d00e85e0a84a03900dc41389cd4f26d533a3aa42142a9e17708d7b87d722f1c9348f61a5db3e59d
DIST xen-4.2.3-upstream-patches-0.tar.xz 84436 SHA256 7c2477b9b29c9d84bb26ed60bfc2700f2a614ed8040b93906e801831f3498b41 SHA512 a4e8b53a0efb9d64d4dc65ee3107422c8007537e03f9c8e6f1b2c838cf62e6819d447c1ed44aacb5c4e9979f0dad7ed313d2db61df6e6ad2d7708a81964a7e12 WHIRLPOOL cc3c2224bba3b2e5f057ec95f9e85e58b17bc0dce338da429c7970877967cddf69228258ff491be9c1d022169a90fcde34ef1bcb0c198c9123ca219707a5a99f
DIST xen-4.2.3.tar.gz 15613235 SHA256 69b6a73701383d609ad094a38925004e8595755fb39a6fafd579ba754e8667db SHA512 01521c8724354f92a2555683a8b103e5e16aedeb2c6166cc3ce40a0cc6cd9e07a601aa24930bb7391e00eb97f04003e6523dead09382cf86eb56f5b886509b9a WHIRLPOOL e7f7848ad632e5e77db95b2eb37c82f31a73021af4b6bb44091cc14103faa193bc2d6deb089e2a196daab5a08dbc08f135a8937a25a4ff5d31fe37c789bae1e9
DIST xen-4.2.4-upstream-patches-0.tar.xz 15480 SHA256 c01c2edf3f7f0f3e1c9408f2eddb2ee3d211a3fe44833852335488bb585072b1 SHA512 3eb85f982478b9c09db94978fee4e042c556ddcd4b89aaff1c4a3adf07b118404eeacb29b83e58e2e8a1d389d0027903458d14b2b900b31f4806f7c428a387b9 WHIRLPOOL d4c9b0550b0f38f5227ea305c0b983deafb97bdac4fa498bc791dce6796d564303813959a1a90d488b69d5540ef9a65fab70598329420691d30b4f4c48de37e9
DIST xen-4.2.4.tar.gz 15663999 SHA256 e23e6292affd7a6d82da99527e8bf3964e57eb7322144c67c2025692b1a21550 SHA512 3e5263511e7c40899f580f3384bd987f9c875b8e6816202fd1a5a64fe7e336803d09e58148af074938ef261f0ceeafad121ac541ddd2bf66b76c5aa4ad07c357 WHIRLPOOL 25d23f5d921139ba0f853fcd76ae998647d32292bccfd4e7c4f3b12f860a38fbb33ebda67c839657bf3a25d837c9c02b80d663362263d16d42284ffde09f0bc2
DIST xen-4.3.1.tar.gz 16429423 SHA256 3b5b7cc508b1739753585b5c25635471cdcef680e8770a78bf6ef9333d26a9fd SHA512 f5250ad5ad3defc5dc1207eb6208a3928128ef57ac4162018bd92b750dc1df1eaaf37835528aca33a0f9e04c82d5f8c4ba79c03a1780d2b72cbb90cc26f77275 WHIRLPOOL 087390786cea9aee273a5d81988436303991aa5ea92faf111d3b619517368f8c8feef84f4f8c602cac723980a344eb90414887db4ca88a2ee14bc6b0253e36ca
DIST xen-4.3.2-upstream-patches-0.tar.xz 13844 SHA256 c083f9b4490049cfcd83782574f52847df9b5738c8fe3220481526e73d01c380 SHA512 69c5b4fbfcf4ddc5964a7c0b60012eab244368d67c625cdb67d9c33f1e273c04234bed1e78de9e6a40ede1a30d279d5d588718bd5f210d37e016e53c03a4a0f9 WHIRLPOOL bb7b088fec542521fe6a0438607618c390f83da379f9a6de57472afdfb0f5d4a3aedcdaf43716df4353eb1cbf642a34e2da546da974bb8906a6780486d3844f6
DIST xen-4.3.2.tar.gz 16472188 SHA256 17611d95f955302560ff72d97c08933b4e62bc2e8ffb71400fc54e388746ff69 SHA512 ec94d849b56ec590b89022075ce43768d8ef44b7be9580ce032509b44c085f0f66495845607a18cd3dea6b89c69bc2a18012705556f59288cd8653c3e5eca302 WHIRLPOOL 72250369fb2c90ba608e1da018cb6417b3089642c8ba59af9f2825ec5ba7c4e6c5d6f86140b20825817e4625727c6d58c5d38b00863c994e31c8a04927997bd3
DIST xen-4.4.0-upstream-patches-0.tar.xz 13124 SHA256 78d3e7dfd8c2f6243954fa320406d332c318e598e0602b4a7df7949260fb4f16 SHA512 c8bf9687742c352f20df85eee9f72e7d27a4250612396be7d61ed0e2251f1508f0be4ebecf39e5fbf001f7dbc5642f46a9d388dfb6f75231998f0e7221c9a6a1 WHIRLPOOL 2fe18ea84cacb4b2baef8c701e3383c14b9d354b3dfab6ffc14e455a764815c520a00ad485d7faf6281e60f4b09010fd2f71e497313ed4af7fd4b44cc9eb3716
DIST xen-4.4.0.tar.gz 18116578 SHA256 6910a504fe2ffe8db0e7a44756ce1c4c95e1ccbef942a1fc8da27aced5aac021 SHA512 84bc293415b8ce9686240b0145a92be190cdd7032c66b5b07906baacbfeb33ad1e6148336e951fd4506b7f4e0b250937c702226c0207d7088a50e643bedabd17 WHIRLPOOL 87886cc83bf1eaaf5dd5b67d7cc82823d98dd9b4b47c0a178ea70ee2367c1a4a142aa66df13f58603840d0e310fb5c09dc0d5b87f6361c934e1c83c95d09d406

1
app-emulation/xen-tools/metadata.xml
Unescape View File

@ -9,6 +9,7 @@
<flag name='qemu'>Enable IOEMU support via the use of qemu-dm</flag>
<flag name='pygrub'>Install the pygrub boot loader</flag>
<flag name='screen'>Enable support for running domain U console in an <pkg>app-misc/screen</pkg> session</flag>
<flag name='system-qemu'>Using <pkg>app-emulation/qemu</pkg> instead of the bundled one</flag>
<flag name='xend'>Enable support the xend and xm to manage xen</flag>
<flag name='ocaml'>Enable support for the ocaml language</flag>
<flag name='pam'>Enable pam support</flag>

399
app-emulation/xen-tools/xen-tools-4.2.4-r1.ebuild
Unescape View File

@ -0,0 +1,399 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.4-r1.ebuild,v 1.1 2014/04/12 00:37:09 dlan Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
PYTHON_REQ_USE='xml,threads'
if [[ $PV == *9999 ]]; then
KEYWORDS=""
REPO="xen-unstable.hg"
EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
S="${WORKDIR}/${REPO}"
live_eclass="mercurial"
else
KEYWORDS="~amd64 ~x86"
UPSTREAM_VER=0
GENTOO_VER=
[[ -n ${UPSTREAM_VER} ]] && \
UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
[[ -n ${GENTOO_VER} ]] && \
GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
${UPSTREAM_PATCHSET_URI}
${GENTOO_PATCHSET_URI}"
S="${WORKDIR}/xen-${PV}"
fi
inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
DESCRIPTION="Xend daemon and tools"
HOMEPAGE="http://xen.org/"
DOCS=( README docs/README.xen-bugtool )
LICENSE="GPL-2"
SLOT="0"
IUSE="api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs xend"
REQUIRED_USE="hvm? ( qemu )
${PYTHON_REQUIRED_USE}"
DEPEND="dev-libs/lzo:2
dev-libs/glib:2
dev-libs/yajl
dev-libs/libgcrypt:0
dev-python/lxml[${PYTHON_USEDEP}]
dev-python/pypam[${PYTHON_USEDEP}]
sys-libs/zlib
sys-power/iasl
sys-firmware/seabios
sys-firmware/ipxe
dev-ml/findlib
hvm? ( media-libs/libsdl )
${PYTHON_DEPS}
api? ( dev-libs/libxml2
net-misc/curl )
${PYTHON_DEPS}
pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
sys-devel/bin86
sys-devel/dev86
dev-lang/perl
app-misc/pax-utils
doc? (
app-doc/doxygen
dev-tex/latex2html[png,gif]
media-gfx/transfig
media-gfx/graphviz
dev-tex/xcolor
dev-texlive/texlive-latexextra
virtual/latex-base
dev-tex/latexmk
dev-texlive/texlive-latex
dev-texlive/texlive-pictures
dev-texlive/texlive-latexrecommended
)
hvm? ( x11-proto/xproto
!net-libs/libiscsi )"
RDEPEND="sys-apps/iproute2
net-misc/bridge-utils
ocaml? ( >=dev-lang/ocaml-4 )
screen? (
app-misc/screen
app-admin/logrotate
)
virtual/udev"
# hvmloader is used to bootstrap a fully virtualized kernel
# Approved by QA team in bug #144032
QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
RESTRICT="test"
pkg_setup() {
python-single-r1_pkg_setup
export "CONFIG_LOMOUNT=y"
if has_version dev-libs/libgcrypt:0; then
export "CONFIG_GCRYPT=y"
fi
if use qemu; then
export "CONFIG_IOEMU=y"
else
export "CONFIG_IOEMU=n"
fi
if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then
eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or"
eerror "an amd64 multilib profile is required. Remove the hvm use flag"
eerror "to build xen-tools on your current profile."
die "USE=hvm is unsupported on this system."
fi
if [[ -z ${XEN_TARGET_ARCH} ]] ; then
if use x86 && use amd64; then
die "Confusion! Both x86 and amd64 are set in your use flags!"
elif use x86; then
export XEN_TARGET_ARCH="x86_32"
elif use amd64 ; then
export XEN_TARGET_ARCH="x86_64"
else
die "Unsupported architecture!"
fi
fi
use api && export "LIBXENAPI_BINDINGS=y"
use flask && export "FLASK_ENABLE=y"
}
src_prepare() {
# Upstream's patchset
if [[ -n ${UPSTREAM_VER} ]]; then
EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" \
epatch "${WORKDIR}"/patches-upstream
fi
# Gentoo's patchset
if [[ -n ${GENTOO_VER} ]]; then
EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" \
epatch "${WORKDIR}"/patches-gentoo
fi
# Drop .config, fixes to gcc-4.6
epatch "${FILESDIR}"/${PN/-tools/}-4-fix_dotconfig-gcc.patch
# Xend
if ! use xend; then
sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \
-i tools/misc/Makefile || die "Disabling xend failed"
sed -e 's:^XEND_INITD:#XEND_INITD:' \
-i tools/examples/Makefile || die "Disabling xend failed"
fi
# if the user *really* wants to use their own custom-cflags, let them
if use custom-cflags; then
einfo "User wants their own CFLAGS - removing defaults"
# try and remove all the default cflags
find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
-exec sed \
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-i {} + || die "failed to re-set custom-cflags"
fi
if ! use pygrub; then
sed -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' -i tools/Makefile || die
fi
# Disable hvm support on systems that don't support x86_32 binaries.
if ! use hvm; then
sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die
sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
fi
# Don't bother with qemu, only needed for fully virtualised guests
if ! use qemu; then
sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die
sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die
fi
# Fix texi2html build error with new texi2html, qemu.doc.html
epatch "${FILESDIR}"/${PN}-4-docfix.patch \
"${FILESDIR}"/${PN}-4-qemu-xen-doc.patch
# Fix network broadcast on bridged networks
epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
# Bug 496708
epatch "${FILESDIR}"/${PN}-4-unbundle-ipxe.patch
epatch "${FILESDIR}"/${PN}-4-unbundle-seabios.patch
# Fix bridge by idella4, bug #362575
epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch"
# Don't build ipxe with pie on hardened, Bug #360805
if gcc-specs-pie; then
epatch "${FILESDIR}"/ipxe-nopie.patch
fi
# Prevent double stripping of files at install
epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-nostrip.patch
# fix jobserver in Makefile
epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-jserver.patch
# add missing header, Bug #467200
epatch "${FILESDIR}"/xen-4-ulong.patch \
"${FILESDIR}"/${PN}-4.2-xen_disk_leak.patch
# Set dom0-min-mem to kb; Bug #472982
epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch
# Bug 463840
epatch "${FILESDIR}"/${PN}-4.2.2-install.patch
epatch "${FILESDIR}"/${PN}-4.2.2-rt-link.patch
# Bug 379537
epatch "${FILESDIR}"/fix-gold-ld.patch
# Bug 472438
sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \
-i Config.mk || die
# Bug 445986
sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' -i tools/firmware/Makefile || die
# fix QA warning, create /var/run/, /var/lock dynamically
sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \
tools/libxl/Makefile || die
sed -i -e "/\/var\/run\//d" \
tools/xenstore/Makefile \
tools/pygrub/Makefile || die
sed -i -e "/\/var\/lock\/subsys/d" \
tools/Makefile || die
# xencommons, Bug #492332, sed lighter weight than patching
sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-i tools/hotplug/Linux/init.d/xencommons || die
epatch_user
}
src_compile() {
export VARTEXFONTS="${T}/fonts"
local myopt
use debug && myopt="${myopt} debug=y"
use custom-cflags || unset CFLAGS
if test-flag-CC -fno-strict-overflow; then
append-flags -fno-strict-overflow
fi
unset LDFLAGS
unset CFLAGS
emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
use doc && emake -C docs txt html
emake -C docs man-pages
}
src_install() {
# Override auto-detection in the build system, bug #382573
export INITD_DIR=/tmp/init.d
export CONFIG_LEAF_DIR=../tmp/default
# Let the build system compile installed Python modules.
local PYTHONDONTWRITEBYTECODE
export PYTHONDONTWRITEBYTECODE
emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" install-tools \
XEN_PYTHON_NATIVE_INSTALL=y install-tools
# Fix the remaining Python shebangs.
python_fix_shebang "${ED}"
# Remove RedHat-specific stuff
rm -rf "${D}"tmp || die
# uncomment lines in xl.conf
sed -e 's:^#autoballoon=1:autoballoon=1:' \
-e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \
-e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
-i tools/examples/xl.conf || die
# Reset bash completion dir; Bug 472438
mv "${D}"bash-completion "${D}"usr/share/ || die
if use doc; then
emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
dohtml -r docs/
docinto pdf
dodoc ${DOCS[@]}
[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
fi
rm -rf "${D}"/usr/share/doc/xen/
doman docs/man?/*
if use xend; then
newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd"
fi
newconfd "${FILESDIR}"/xendomains.confd xendomains
newconfd "${FILESDIR}"/xenstored.confd xenstored
newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
newinitd "${FILESDIR}"/xenstored.initd xenstored
newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
newinitd "${FILESDIR}"/xencommons.initd xencommons
newconfd "${FILESDIR}"/xencommons.confd xencommons
if use screen; then
cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains || die
cp "${FILESDIR}"/xen-consoles.logrotate "${ED}"/etc/xen/ || die
keepdir /var/log/xen-consoles
fi
if [[ "${ARCH}" == 'amd64' ]] && use qemu; then
mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die
mv "${D}"usr/lib/xen/bin/qemu* "${D}"usr/$(get_libdir)/xen/bin/ || die
fi
# For -static-libs wrt Bug 384355
if ! use static-libs; then
rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
fi
# xend expects these to exist
keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
# for xendomains
keepdir /etc/xen/auto
# Temp QA workaround
dodir "$(udev_get_udevdir)"
mv "${D}"/etc/udev/* "${D}/$(udev_get_udevdir)"
rm -rf "${D}"/etc/udev
# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
}
pkg_postinst() {
elog "Official Xen Guide and the offical wiki page:"
elog "http://www.gentoo.org/doc/en/xen-gu"${D}"usr/ide.xml"
elog "http://wiki.xen.org/wiki/Main_Page"
elog ""
elog "Recommended to utilise the xencommons script to config sytem at boot."
elog "Add by use of rc-update on completion of the install"
if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then
echo
ewarn "xend may not work when python is built with stack smashing protection (ssp)."
ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866"
ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug."
fi
# TODO: we need to have the current Python slot here.
if ! has_version "dev-lang/python[ncurses]"; then
echo
ewarn "NB: Your dev-lang/python is built without USE=ncurses."
ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
fi
if has_version "sys-apps/iproute2[minimal]"; then
echo
ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
ewarn "will not work until you rebuild iproute2 without USE=minimal."
fi
if ! use hvm; then
echo
elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
elog "support enable the hvm use flag."
elog "An x86 or amd64 multilib system is required to build HVM support."
fi
if use xend; then
echo
elog "xend capability has been enabled and installed"
fi
if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
echo
elog "xensv is broken upstream (Gentoo bug #142011)."
elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
fi
}

4
app-emulation/xen-tools/xen-tools-4.3.1-r5.ebuild
Unescape View File

@ -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-emulation/xen-tools/xen-tools-4.3.1-r5.ebuild,v 1.5 2014/03/01 23:06:15 mgorny Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.1-r5.ebuild,v 1.6 2014/04/12 08:38:00 idella4 Exp $
EAPI=5
@ -58,7 +58,7 @@ DEPEND="dev-libs/lzo:2
sys-devel/dev86
dev-lang/perl
app-misc/pax-utils
dev-python/markdown
dev-python/markdown[${PYTHON_USEDEP}]
doc? (
app-doc/doxygen
dev-tex/latex2html[png,gif]

4
app-emulation/xen-tools/xen-tools-4.3.1-r6.ebuild
Unescape View File

@ -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-emulation/xen-tools/xen-tools-4.3.1-r6.ebuild,v 1.2 2014/03/01 23:06:15 mgorny Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.1-r6.ebuild,v 1.3 2014/04/12 08:38:00 idella4 Exp $
EAPI=5
@ -55,7 +55,7 @@ DEPEND="dev-libs/lzo:2
sys-devel/dev86
dev-lang/perl
app-misc/pax-utils
dev-python/markdown
dev-python/markdown[${PYTHON_USEDEP}]
doc? (
app-doc/doxygen
dev-tex/latex2html[png,gif]

436
app-emulation/xen-tools/xen-tools-4.3.2-r1.ebuild
Unescape View File

@ -0,0 +1,436 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.2-r1.ebuild,v 1.1 2014/04/12 00:37:09 dlan Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
PYTHON_REQ_USE='xml,threads'
if [[ $PV == *9999 ]]; then
KEYWORDS=""
REPO="xen-unstable.hg"
EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
S="${WORKDIR}/${REPO}"
live_eclass="mercurial"
else
KEYWORDS="~amd64 -x86"
UPSTREAM_VER=0
GENTOO_VER=
[[ -n ${UPSTREAM_VER} ]] && \
UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
[[ -n ${GENTOO_VER} ]] && \
GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
${UPSTREAM_PATCHSET_URI}
${GENTOO_PATCHSET_URI}"
S="${WORKDIR}/xen-${PV}"
fi
inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
DESCRIPTION="Xend daemon and tools"
HOMEPAGE="http://xen.org/"
DOCS=( README docs/README.xen-bugtool )
LICENSE="GPL-2"
SLOT="0"
# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
# >=dev-lang/ocaml-4 stable
# Masked in profiles/eapi-5-files instead
IUSE="api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs xend"
REQUIRED_USE="hvm? ( qemu )
${PYTHON_REQUIRED_USE}
pygrub? ( python )"
DEPEND="dev-libs/lzo:2
dev-libs/glib:2
dev-libs/yajl
dev-libs/libgcrypt:0
dev-python/lxml[${PYTHON_USEDEP}]
pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
sys-libs/zlib
sys-power/iasl
sys-firmware/seabios
sys-firmware/ipxe
hvm? ( media-libs/libsdl )
${PYTHON_DEPS}
api? ( dev-libs/libxml2
net-misc/curl )
pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
sys-devel/bin86
sys-devel/dev86
dev-lang/perl
app-misc/pax-utils
dev-python/markdown
doc? (
app-doc/doxygen
dev-tex/latex2html[png,gif]
media-gfx/graphviz
dev-tex/xcolor
media-gfx/transfig
dev-texlive/texlive-latexextra
virtual/latex-base
dev-tex/latexmk
dev-texlive/texlive-latex
dev-texlive/texlive-pictures
dev-texlive/texlive-latexrecommended
)
hvm? ( x11-proto/xproto
!net-libs/libiscsi )
qemu? ( x11-libs/pixman )
ocaml? ( dev-ml/findlib
>=dev-lang/ocaml-4 )"
RDEPEND="sys-apps/iproute2
net-misc/bridge-utils
screen? (
app-misc/screen
app-admin/logrotate
)
virtual/udev"
# hvmloader is used to bootstrap a fully virtualized kernel
# Approved by QA team in bug #144032
QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
RESTRICT="test"
pkg_setup() {
python-single-r1_pkg_setup
export "CONFIG_LOMOUNT=y"
if has_version dev-libs/libgcrypt:0; then
export "CONFIG_GCRYPT=y"
fi
if use qemu; then
export "CONFIG_IOEMU=y"
else
export "CONFIG_IOEMU=n"
fi
if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then
eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or"
eerror "an amd64 multilib profile is required. Remove the hvm use flag"
eerror "to build xen-tools on your current profile."
die "USE=hvm is unsupported on this system."
fi
if [[ -z ${XEN_TARGET_ARCH} ]] ; then
if use x86 && use amd64; then
die "Confusion! Both x86 and amd64 are set in your use flags!"
elif use x86; then
export XEN_TARGET_ARCH="x86_32"
elif use amd64 ; then
export XEN_TARGET_ARCH="x86_64"
else
die "Unsupported architecture!"
fi
fi
}
src_prepare() {
# Upstream's patchset
if [[ -n ${UPSTREAM_VER} ]]; then
EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" \
epatch "${WORKDIR}"/patches-upstream
fi
# Gentoo's patchset
if [[ -n ${GENTOO_VER} ]]; then
EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" \
epatch "${WORKDIR}"/patches-gentoo
fi
# Drop .config, fixes to gcc-4.6
epatch "${FILESDIR}"/${PN/-tools/}-4.3-fix_dotconfig-gcc.patch
# Fix texi2html build error with new texi2html, qemu.doc.html
epatch "${FILESDIR}"/${PN}-4-docfix.patch \
"${FILESDIR}"/${PN}-4-qemu-xen-doc.patch
# Fix network broadcast on bridged networks
epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
# Bug 496708
epatch "${FILESDIR}"/${PN}-4-unbundle-ipxe.patch
epatch "${FILESDIR}"/${PN}-4-unbundle-seabios.patch
# Fix bridge by idella4, bug #362575
epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch"
# Prevent double stripping of files at install
epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-nostrip.patch
# fix jobserver in Makefile
epatch "${FILESDIR}"/${PN/-tools/}-4.3-jserver.patch
# add missing header
epatch "${FILESDIR}"/xen-4-ulong.patch
# Set dom0-min-mem to kb; Bug #472982
epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch
# Bug 477676
epatch "${FILESDIR}"/${PN}-4.3-ar-cc.patch
# Bug 379537
epatch "${FILESDIR}"/fix-gold-ld.patch
# Prevent file collision with qemu package Bug 478064
epatch "${FILESDIR}"/qemu-bridge.patch
mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
# Xend
if ! use xend; then
sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \
-i tools/misc/Makefile || die "Disabling xend failed"
sed -e 's:^XEND_INITD:#XEND_INITD:' \
-i tools/examples/Makefile || die "Disabling xend failed"
fi
# if the user *really* wants to use their own custom-cflags, let them
if use custom-cflags; then
einfo "User wants their own CFLAGS - removing defaults"
# try and remove all the default cflags
find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
-exec sed \
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-i {} + || die "failed to re-set custom-cflags"
fi
if ! use pygrub; then
sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
fi
if ! use python; then
sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
fi
# Disable hvm support on systems that don't support x86_32 binaries.
if ! use hvm; then
sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die
sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
fi
# Don't bother with qemu, only needed for fully virtualised guests
if ! use qemu; then
sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die
sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die
fi
# Bug 472438
sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \
-i Config.mk || die
use flask || sed -e "/SUBDIRS-y += flask/d" -i tools/Makefile || die
use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
-i tools/firmware/Makefile || die
# xencommons, Bug #492332, sed lighter weight than patching
sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-i tools/hotplug/Linux/init.d/xencommons || die
# Bug 493232 fix from http://bugzilla.xensource.com/bugzilla/show_bug.cgi?id=1844
sed -e 's:bl->argsspace = 7 + :bl->argsspace = 9 + :' \
-i tools/libxl/libxl_bootloader.c || die
# fix QA warning, create /var/run/, /var/lock dynamically
sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \
tools/libxl/Makefile || die
sed -i -e "/\/var\/run\//d" \
tools/xenstore/Makefile \
tools/pygrub/Makefile || die
sed -i -e "/\/var\/lock\/subsys/d" \
tools/Makefile || die
epatch_user
}
src_configure() {
local myconf="--prefix=/usr --disable-werror"
if use ocaml
then
myconf="${myconf} $(use_enable ocaml ocamltools)"
else
myconf="${myconf} --disable-ocamltools"
fi
if ! use pam
then
myconf="${myconf} --disable-pam"
fi
econf ${myconf}
}
src_compile() {
export VARTEXFONTS="${T}/fonts"
local myopt
use debug && myopt="${myopt} debug=y"
use custom-cflags || unset CFLAGS
if test-flag-CC -fno-strict-overflow; then
append-flags -fno-strict-overflow
fi
unset LDFLAGS
unset CFLAGS
emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
use doc && emake -C docs txt html
emake -C docs man-pages
}
src_install() {
# Override auto-detection in the build system, bug #382573
export INITD_DIR=/tmp/init.d
export CONFIG_LEAF_DIR=../tmp/default
# Let the build system compile installed Python modules.
local PYTHONDONTWRITEBYTECODE
export PYTHONDONTWRITEBYTECODE
emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
XEN_PYTHON_NATIVE_INSTALL=y install-tools
# Fix the remaining Python shebangs.
python_fix_shebang "${D}"
# Remove RedHat-specific stuff
rm -rf "${D}"tmp || die
# uncomment lines in xl.conf
sed -e 's:^#autoballoon=1:autoballoon=1:' \
-e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \
-e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
-i tools/examples/xl.conf || die
# Reset bash completion dir; Bug 472438
mv "${D}"bash-completion "${D}"usr/share/ || die
if use doc; then
emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
dohtml -r docs/
docinto pdf
dodoc ${DOCS[@]}
[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
fi
rm -rf "${D}"/usr/share/doc/xen/
doman docs/man?/*
if use xend; then
newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd"
fi
newconfd "${FILESDIR}"/xendomains.confd xendomains
newconfd "${FILESDIR}"/xenstored.confd xenstored
newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
newinitd "${FILESDIR}"/xenstored.initd xenstored
newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
newinitd "${FILESDIR}"/xencommons.initd xencommons
newconfd "${FILESDIR}"/xencommons.confd xencommons
newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
if use screen; then
cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
keepdir /var/log/xen-consoles
fi
# Move files built with use qemu, Bug #477884
if [[ "${ARCH}" == 'amd64' ]] && use qemu; then
mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die
mv "${D}"usr/lib/xen/bin/* "${D}"usr/$(get_libdir)/xen/bin/ || die
fi
# For -static-libs wrt Bug 384355
if ! use static-libs; then
rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
fi
# xend expects these to exist
keepdir /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
# for xendomains
keepdir /etc/xen/auto
# Temp QA workaround
dodir "$(udev_get_udevdir)"
mv "${D}"/etc/udev/* "${D}/$(udev_get_udevdir)"
rm -rf "${D}"/etc/udev
# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
}
pkg_postinst() {
elog "Official Xen Guide and the offical wiki page:"
elog "https://wiki.gentoo.org/wiki/Xen"
elog "http://wiki.xen.org/wiki/Main_Page"
elog ""
elog "Recommended to utilise the xencommons script to config sytem At boot"
elog "Add by use of rc-update on completion of the install"
if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then
echo
ewarn "xend may not work when python is built with stack smashing protection (ssp)."
ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866"
ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug."
fi
# TODO: we need to have the current Python slot here.
if ! has_version "dev-lang/python[ncurses]"; then
echo
ewarn "NB: Your dev-lang/python is built without USE=ncurses."
ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
fi
if has_version "sys-apps/iproute2[minimal]"; then
echo
ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
ewarn "will not work until you rebuild iproute2 without USE=minimal."
fi
if ! use hvm; then
echo
elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
elog "support enable the hvm use flag."
elog "An x86 or amd64 multilib system is required to build HVM support."
fi
if use xend; then
elog"";elog "xend capability has been enabled and installed"
fi
if use qemu; then
elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently"
elog "with the qemu capable xen. It is up to the user to distinguish between and utilise"
elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
fi
if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
echo
elog "xensv is broken upstream (Gentoo bug #142011)."
elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
fi
}

4
app-emulation/xen-tools/xen-tools-4.3.2.ebuild
Unescape View File

@ -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-emulation/xen-tools/xen-tools-4.3.2.ebuild,v 1.4 2014/03/01 23:06:15 mgorny Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.2.ebuild,v 1.5 2014/04/12 08:38:00 idella4 Exp $
EAPI=5
@ -65,7 +65,7 @@ DEPEND="dev-libs/lzo:2
sys-devel/dev86
dev-lang/perl
app-misc/pax-utils
dev-python/markdown
dev-python/markdown[${PYTHON_USEDEP}]
doc? (
app-doc/doxygen
dev-tex/latex2html[png,gif]

425
app-emulation/xen-tools/xen-tools-4.4.0-r1.ebuild
Unescape View File

@ -0,0 +1,425 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.0-r1.ebuild,v 1.1 2014/04/12 00:37:09 dlan Exp $
EAPI=5
MY_PV=${PV/_/-}
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE='xml,threads'
if [[ $PV == *9999 ]]; then
KEYWORDS=""
REPO="xen-unstable.hg"
EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
S="${WORKDIR}/${REPO}"
live_eclass="mercurial"
else
KEYWORDS="~amd64 ~arm -x86"
UPSTREAM_VER=0
GENTOO_VER=
[[ -n ${UPSTREAM_VER} ]] && \
UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
[[ -n ${GENTOO_VER} ]] && \
GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
${UPSTRAM_PATCHSET_URI}
${GENTOO_PATCHSET_URI}"
S="${WORKDIR}/xen-${MY_PV}"
fi
inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
DESCRIPTION="Xend daemon and tools"
HOMEPAGE="http://xen.org/"
DOCS=( README docs/README.xen-bugtool )
LICENSE="GPL-2"
SLOT="0"
# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
# >=dev-lang/ocaml-4 stable
# Masked in profiles/eapi-5-files instead
IUSE="api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs system-qemu"
REQUIRED_USE="hvm? ( || ( qemu system-qemu ) )
${PYTHON_REQUIRED_USE}
pygrub? ( python )
qemu? ( !system-qemu )"
COMMON_DEPEND="
dev-libs/lzo:2
dev-libs/glib:2
dev-libs/yajl
dev-libs/libaio
dev-libs/libgcrypt:0
sys-libs/zlib
"
DEPEND="${COMMON_DEPEND}
dev-python/lxml[${PYTHON_USEDEP}]
pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
hvm? ( media-libs/libsdl )
${PYTHON_DEPS}
api? ( dev-libs/libxml2
net-misc/curl )
pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
arm? ( >=sys-apps/dtc-1.4.0 )
!arm? ( sys-devel/bin86
sys-firmware/ipxe
sys-firmware/seabios
sys-devel/dev86
sys-power/iasl )
dev-lang/perl
app-misc/pax-utils
dev-python/markdown
doc? (
app-doc/doxygen
dev-tex/latex2html[png,gif]
media-gfx/graphviz
dev-tex/xcolor
media-gfx/transfig
dev-texlive/texlive-latexextra
virtual/latex-base
dev-tex/latexmk
dev-texlive/texlive-latex
dev-texlive/texlive-pictures
dev-texlive/texlive-latexrecommended
)
hvm? ( x11-proto/xproto
!net-libs/libiscsi )
qemu? ( x11-libs/pixman )
system-qemu? ( app-emulation/qemu[xen] )
ocaml? ( dev-ml/findlib
>=dev-lang/ocaml-4 )"
RDEPEND="${COMMON_DEPEND}
sys-apps/iproute2
net-misc/bridge-utils
screen? (
app-misc/screen
app-admin/logrotate
)
virtual/udev"
# hvmloader is used to bootstrap a fully virtualized kernel
# Approved by QA team in bug #144032
QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
RESTRICT="test"
pkg_setup() {
python-single-r1_pkg_setup
export "CONFIG_LOMOUNT=y"
if has_version dev-libs/libgcrypt:0; then
export "CONFIG_GCRYPT=y"
fi
if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then
eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or"
eerror "an amd64 multilib profile is required. Remove the hvm use flag"
eerror "to build xen-tools on your current profile."
die "USE=hvm is unsupported on this system."
fi
if [[ -z ${XEN_TARGET_ARCH} ]] ; then
if use x86 && use amd64; then
die "Confusion! Both x86 and amd64 are set in your use flags!"
elif use x86; then
export XEN_TARGET_ARCH="x86_32"
elif use amd64 ; then
export XEN_TARGET_ARCH="x86_64"
elif use arm; then
export XEN_TARGET_ARCH="arm32"
else
die "Unsupported architecture!"
fi
fi
#bug 472438
export BASH_COMPLETION_DIR=/usr/share/bash-completion
}
src_prepare() {
# Upstream's patchset
if [[ -n ${UPSTREAM_VER} ]]; then
EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" \
epatch "${WORKDIR}"/patches-upstream
fi
# Gentoo's patchset
if [[ -n ${GENTOO_VER} ]]; then
EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" \
epatch "${WORKDIR}"/patches-gentoo
fi
# Fix texi2html build error with new texi2html, qemu.doc.html
epatch "${FILESDIR}"/${PN}-4-docfix.patch
# Fix network broadcast on bridged networks
epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
# Bug 496708
epatch "${FILESDIR}"/${PN}-4-unbundle-ipxe.patch
# Fix bridge by idella4, bug #362575
epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch"
# Prevent double stripping of files at install
epatch "${FILESDIR}"/${PN/-tools/}-4.4-nostrip.patch
# fix jobserver in Makefile
epatch "${FILESDIR}"/${PN/-tools/}-4.3-jserver.patch
# Set dom0-min-mem to kb; Bug #472982
epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch
# Bug 477676
epatch "${FILESDIR}"/${PN}-4.3-ar-cc.patch
# Bug 379537
epatch "${FILESDIR}"/fix-gold-ld.patch
# Prevent file collision with qemu package Bug 478064
epatch "${FILESDIR}"/xen-4.4-qemu-bridge.patch
mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
epatch "${FILESDIR}"/${PN}-4.4-api-fix.patch
use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
-i tools/firmware/Makefile || die
# Drop .config, fixes to gcc-4.6
sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
# if the user *really* wants to use their own custom-cflags, let them
if use custom-cflags; then
einfo "User wants their own CFLAGS - removing defaults"
# try and remove all the default cflags
find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
-exec sed \
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-i {} + || die "failed to re-set custom-cflags"
fi
if ! use pygrub; then
sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
fi
if ! use python; then
sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
fi
# Disable hvm support on systems that don't support x86_32 binaries.
if ! use hvm; then
sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
fi
# Don't bother with qemu, only needed for fully virtualised guests
if ! use qemu; then
sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
fi
# Bug 472438
sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \
-i Config.mk || die
# xencommons, Bug #492332, sed lighter weight than patching
sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-i tools/hotplug/Linux/init.d/xencommons || die
# respect multilib, usr/lib/libcacard.so.0.0.0
sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
-i tools/qemu-xen/configure || die
# fix QA warning, create /var/run/, /var/lock dynamically
sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \
tools/libxl/Makefile || die
sed -i -e "/\/var\/run\//d" \
tools/xenstore/Makefile \
tools/pygrub/Makefile || die
sed -i -e "/\/var\/lock\/subsys/d" \
tools/Makefile || die
epatch_user
}
src_configure() {
local myconf="--prefix=/usr \
--libdir=/usr/$(get_libdir) \
--disable-werror \
--with-system-seabios=/usr/share/seabios/bios.bin \
--disable-xen \
--enable-tools \
--enable-docs \
--disable-qemu-traditional \
$(use_with system-qemu) \
$(use_enable pam) \
$(use_enable api xenapi) \
$(use_enable ocaml ocamltools) \
"
use qemu || myconf+=" --with-system-qemu"
econf ${myconf}
}
src_compile() {
export VARTEXFONTS="${T}/fonts"
local myopt
use debug && myopt="${myopt} debug=y"
use custom-cflags || unset CFLAGS
if test-flag-CC -fno-strict-overflow; then
append-flags -fno-strict-overflow
fi
unset LDFLAGS
unset CFLAGS
emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
use doc && emake -C docs txt html
emake -C docs man-pages
}
src_install() {
# Override auto-detection in the build system, bug #382573
export INITD_DIR=/tmp/init.d
export CONFIG_LEAF_DIR=../tmp/default
# Let the build system compile installed Python modules.
local PYTHONDONTWRITEBYTECODE
export PYTHONDONTWRITEBYTECODE
emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
XEN_PYTHON_NATIVE_INSTALL=y install-tools
# Fix the remaining Python shebangs.
python_fix_shebang "${D}"
# Remove RedHat-specific stuff
rm -rf "${D}"tmp || die
# uncomment lines in xl.conf
sed -e 's:^#autoballoon=1:autoballoon=1:' \
-e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \
-e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
-i tools/examples/xl.conf || die
# Reset bash completion dir; Bug 472438
mv "${D}"bash-completion "${D}"usr/share/ || die
if use doc; then
emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
dohtml -r docs/
docinto pdf
dodoc ${DOCS[@]}
[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
fi
rm -rf "${D}"/usr/share/doc/xen/
doman docs/man?/*
newconfd "${FILESDIR}"/xendomains.confd xendomains
newconfd "${FILESDIR}"/xenstored.confd xenstored
newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
newinitd "${FILESDIR}"/xenstored.initd xenstored
newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
newinitd "${FILESDIR}"/xencommons.initd xencommons
newconfd "${FILESDIR}"/xencommons.confd xencommons
newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
if use screen; then
cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
keepdir /var/log/xen-consoles
fi
# Move files built with use qemu, Bug #477884
if [[ "${ARCH}" == 'amd64' ]] && use qemu; then
mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die
mv "${D}"usr/lib/xen/bin/* "${D}"usr/$(get_libdir)/xen/bin/ || die
fi
# For -static-libs wrt Bug 384355
if ! use static-libs; then
rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
fi
# xend expects these to exist
keepdir /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
# for xendomains
keepdir /etc/xen/auto
# Temp QA workaround
dodir "$(udev_get_udevdir)"
mv "${D}"/etc/udev/* "${D}/$(udev_get_udevdir)"
rm -rf "${D}"/etc/udev
# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
}
pkg_postinst() {
elog "Official Xen Guide and the offical wiki page:"
elog "https://wiki.gentoo.org/wiki/Xen"
elog "http://wiki.xen.org/wiki/Main_Page"
elog ""
elog "Recommended to utilise the xencommons script to config sytem At boot"
elog "Add by use of rc-update on completion of the install"
if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then
echo
ewarn "xend may not work when python is built with stack smashing protection (ssp)."
ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866"
ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug."
fi
# TODO: we need to have the current Python slot here.
if ! has_version "dev-lang/python[ncurses]"; then
echo
ewarn "NB: Your dev-lang/python is built without USE=ncurses."
ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
fi
if has_version "sys-apps/iproute2[minimal]"; then
echo
ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
ewarn "will not work until you rebuild iproute2 without USE=minimal."
fi
if ! use hvm; then
echo
elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
elog "support enable the hvm use flag."
elog "An x86 or amd64 multilib system is required to build HVM support."
fi
if use qemu; then
elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently"
elog "with the qemu capable xen. It is up to the user to distinguish between and utilise"
elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
fi
if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
echo
elog "xensv is broken upstream (Gentoo bug #142011)."
elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
fi
}

4
app-emulation/xen-tools/xen-tools-4.4.0.ebuild
Unescape View File

@ -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-emulation/xen-tools/xen-tools-4.4.0.ebuild,v 1.3 2014/04/04 01:06:31 idella4 Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.0.ebuild,v 1.4 2014/04/12 08:38:00 idella4 Exp $
EAPI=5
@ -73,7 +73,7 @@ DEPEND="${COMMON_DEPEND}
sys-power/iasl )
dev-lang/perl
app-misc/pax-utils
dev-python/markdown
dev-python/markdown[${PYTHON_USEDEP}]
doc? (
app-doc/doxygen
dev-tex/latex2html[png,gif]

12
app-forensics/lynis/lynis-1.5.0.ebuild → app-forensics/lynis/lynis-1.5.0-r1.ebuild
Unescape View File

@ -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-forensics/lynis/lynis-1.5.0.ebuild,v 1.1 2014/04/10 17:41:55 idl0r Exp $
# $Header: /var/cvsroot/gentoo-x86/app-forensics/lynis/lynis-1.5.0-r1.ebuild,v 1.1 2014/04/11 18:38:30 idl0r Exp $
EAPI="5"
@ -17,12 +17,12 @@ DEPEND=""
RDEPEND="app-shells/bash"
src_install() {
insinto /usr/share/${PN}
doins -r db/ include/ plugins/ || die "failed to install lynis base files"
# stricter default perms - bug 507436
diropts -m0750
insopts -m0640
doins -r include/
insopts -m0644
insinto /usr/share/${PN}
doins -r db/ include/ plugins/
dosbin lynis

4
app-vim/automatictexplugin/automatictexplugin-12.4.ebuild
Unescape View File

@ -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-vim/automatictexplugin/automatictexplugin-12.4.ebuild,v 1.1 2014/01/25 11:36:21 radhermit Exp $
# $Header: /var/cvsroot/gentoo-x86/app-vim/automatictexplugin/automatictexplugin-12.4.ebuild,v 1.3 2014/04/12 09:40:06 ago Exp $
EAPI=5
@ -11,7 +11,7 @@ DESCRIPTION="vim plugin: a comprehensive plugin for editing LaTeX files"
HOMEPAGE="http://atp-vim.sourceforge.net/"
SRC_URI="mirror://sourceforge/atp-vim/releases/${MY_P}.tar.gz"
LICENSE="GPL-3"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
S=${WORKDIR}

6
app-vim/bash-support/bash-support-4.1.ebuild
Unescape View File

@ -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/app-vim/bash-support/bash-support-4.1.ebuild,v 1.1 2013/12/10 07:24:59 radhermit Exp $
# $Header: /var/cvsroot/gentoo-x86/app-vim/bash-support/bash-support-4.1.ebuild,v 1.2 2014/04/11 19:46:17 nimiux Exp $
EAPI=5
@ -9,7 +9,7 @@ inherit vim-plugin
DESCRIPTION="vim plugin: Bash-IDE - Write and run bash scripts using menus and hotkeys"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=365"
LICENSE="public-domain"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 ~x86"
VIM_PLUGIN_HELPFILES="${PN}"

6
app-vim/c-support/c-support-6.1.ebuild
Unescape View File

@ -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/app-vim/c-support/c-support-6.1.ebuild,v 1.1 2013/12/30 08:10:47 radhermit Exp $
# $Header: /var/cvsroot/gentoo-x86/app-vim/c-support/c-support-6.1.ebuild,v 1.3 2014/04/12 09:40:19 ago Exp $
EAPI="5"
@ -9,7 +9,7 @@ inherit vim-plugin
DESCRIPTION="vim plugin: C/C++-IDE -- Write and run programs using menus and hotkeys"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=213"
LICENSE="public-domain"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
VIM_PLUGIN_HELPFILES="${PN}"

139
dev-libs/libgamin/libgamin-0.1.10-r5.ebuild
Unescape View File

@ -0,0 +1,139 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild,v 1.1 2014/04/12 08:31:07 mgorny Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7} )
GNOME_ORG_MODULE="gamin"
GNOME_TARBALL_SUFFIX="bz2"
inherit autotools eutils flag-o-matic libtool python-r1 gnome.org multilib-minimal
DESCRIPTION="Library providing the FAM File Alteration Monitor API"
HOMEPAGE="http://www.gnome.org/~veillard/gamin/"
SRC_URI="${SRC_URI}
mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2
http://dev.gentoo.org/~grobian/patches/libgamin-0.1.10-opensolaris.patch.bz2
http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="debug kernel_linux python static-libs"
RESTRICT="test" # needs gam-server
RDEPEND="!app-admin/fam
!<app-admin/gamin-0.1.10"
DEPEND="${RDEPEND}"
src_prepare() {
mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
# Fix QA warnings, bug #257281, upstream #466791
epatch "${FILESDIR}"/${PN}-0.1.10-compilewarnings.patch
if [[ ${CHOST} != *-solaris* ]] ; then
# Fix compile warnings; bug #188923
epatch "${DISTDIR}"/gamin-0.1.9-freebsd.patch.bz2
else
# (Open)Solaris necessary patches (changes configure.in), unfortunately
# conflicts with freebsd patch and breaks some linux installs so it must
# only be applied if on solaris.
epatch "${DISTDIR}"/${P}-opensolaris.patch.bz2
fi
# Fix collision problem due to intermediate library, upstream bug #530635
epatch "${FILESDIR}"/${PN}-0.1.10-noinst-lib.patch
# Fix compilation with latest glib, bug #382783
epatch "${FILESDIR}/${PN}-0.1.10-G_CONST_RETURN-removal.patch"
# Fix crosscompilation issues, bug #267604
epatch "${FILESDIR}/${PN}-0.1.10-crosscompile-fix.patch"
# Enable linux specific features on armel, upstream bug #588338
epatch "${FILESDIR}/${P}-armel-features.patch"
# Fix possible server deadlock in ih_sub_cancel, upstream bug #667230
epatch "${FILESDIR}/${PN}-0.1.10-deadlock.patch"
# Drop DEPRECATED flags
sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' server/Makefile.am || die
# Build only shared version of Python module.
epatch "${FILESDIR}"/${PN}-0.1.10-disable_python_static_library.patch
sed -i \
-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
configure.in || die #466962
# autoconf is required as the user-cflags patch modifies configure.in
# however, elibtoolize is also required, so when the above patch is
# removed, replace the following call with a call to elibtoolize
AT_M4DIR="${WORKDIR}" eautoreconf
}
multilib_src_configure() {
local myconf=(
$(use_enable static-libs static)
--disable-debug
--disable-server
$(use_enable kernel_linux inotify)
$(use_enable debug debug-api)
--without-python
)
local ECONF_SOURCE=${S}
econf "${myconf[@]}"
if multilib_build_binaries && use python; then
python_configure() {
mkdir -p "${BUILD_DIR}" || die
cd "${BUILD_DIR}" || die
econf "${myconf[@]}" --with-python
}
python_parallel_foreach_impl python_configure
fi
}
multilib_src_compile() {
default
if multilib_build_binaries && use python; then
local native_builddir=${BUILD_DIR}
python_compile() {
emake -C "${BUILD_DIR}"/python \
VPATH="${native_builddir}/python:${S}/python" \
_gamin_la_LIBADD="${native_builddir}/libgamin/libgamin-1.la"
}
python_foreach_impl python_compile
fi
}
multilib_src_install() {
emake DESTDIR="${D}" install
if multilib_build_binaries && use python; then
local native_builddir=${BUILD_DIR}
python_install() {
emake -C "${BUILD_DIR}"/python \
DESTDIR="${D}" install \
VPATH="${native_builddir}/python:${S}/python"
}
python_foreach_impl python_install
fi
}
multilib_src_install_all() {
dodoc AUTHORS ChangeLog README TODO NEWS doc/*txt
dohtml doc/*
prune_libtool_files --all
}

1
dev-libs/libmateweather/Manifest
Unescape View File

@ -1 +1,2 @@
DIST libmateweather-1.6.2.tar.xz 3494708 SHA256 2b8c13d448011f1f6ddedcbff5498d5ae6f34cc6330c36010ba25d4062aeda60 SHA512 b2c883c7170291aaa6d41123b3d4d28032925da66e4215b1be2e2d60dc1ea879e19646c9cee2afef95217947d827c5838fb040e79275ac4cd1764674a25e6568 WHIRLPOOL 8b931847b5491740758d21ea414c6e91c811effde54200868060723dd2d962d91aff9c28898675d9a0b7aed99e28f11b965d66ddc7d5be128c5f7f9c6b3fe413
DIST libmateweather-1.8.0.tar.xz 3530972 SHA256 801ec5512e9099c39ce819a82e2dde62477a3783894a5e7fbfff3493d04607ba SHA512 5942af847b6940f94e2ac48bdeb0d3ae96d1e61e1c3ce28d8a3cfa6e2b5b287e5d9f5a1a63481cbdaaf0595243a87c7a35886dc7fdab09f17527388149dd3422 WHIRLPOOL 8181d254bd836e96adaf6b5b7c8d58f9c0652175ccea78a66db12769840db2401d0b5e1a365660cbfa1463bdd4a312ebcd58738bac631b17c4b6ae39472e168b

71
dev-libs/libmateweather/libmateweather-1.8.0.ebuild
Unescape View File

@ -0,0 +1,71 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmateweather/libmateweather-1.8.0.ebuild,v 1.1 2014/04/11 12:20:52 tomwij Exp $
EAPI="5"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes"
PYTHON_COMPAT=( python2_{6,7} )
inherit autotools gnome2 python-r1 versionator
MATE_BRANCH="$(get_version_component_range 1-2)"
SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
DESCRIPTION="MATE library to access weather information from online services"
HOMEPAGE="http://mate-desktop.org"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64"
IUSE="python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND=">=dev-libs/glib-2.13:2[${PYTHON_USEDEP}]
>=dev-libs/libxml2-2.6:2
>=net-libs/libsoup-2.34:2.4
>=sys-libs/timezone-data-2010k:0
x11-libs/gdk-pixbuf:2
>=x11-libs/gtk+-2.11:2
virtual/libintl:0
python? (
${PYTHON_DEPS}
>=dev-python/pygobject-2:2[${PYTHON_USEDEP}]
>=dev-python/pygtk-2:2[${PYTHON_USEDEP}]
)"
DEPEND="${RDEPEND}
>=dev-util/intltool-0.40.3:*
>=mate-base/mate-common-1.6:0
sys-devel/gettext:*
virtual/pkgconfig:*"
src_prepare() {
# Fix undefined use of MKDIR_P in python/Makefile.am.
epatch "${FILESDIR}"/${PN}-1.6.1-fix-mkdirp.patch
eautoreconf
python_copy_sources
python_foreach_impl run_in_build_dir gnome2_src_prepare
}
src_configure() {
python_foreach_impl run_in_build_dir gnome2_src_configure \
--enable-locations-compression \
--disable-all-translations-in-one-xml \
$(use_enable python)
}
src_compile() {
python_foreach_impl run_in_build_dir gnome2_src_compile
}
DOCS="AUTHORS ChangeLog NEWS"
src_install() {
python_foreach_impl run_in_build_dir gnome2_src_install
}

4
dev-perl/Cairo/Cairo-1.103.0.ebuild
Unescape View File

@ -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/Cairo/Cairo-1.103.0.ebuild,v 1.4 2014/04/07 15:48:24 zlogene Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Cairo/Cairo-1.103.0.ebuild,v 1.5 2014/04/12 09:39:25 ago Exp $
EAPI=5
@ -12,7 +12,7 @@ DESCRIPTION="Perl interface to the cairo library"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="test"
RDEPEND="

4
dev-perl/Error/Error-0.170.210.ebuild
Unescape View File

@ -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/Error/Error-0.170.210.ebuild,v 1.5 2014/03/28 03:38:58 jer Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Error/Error-0.170.210.ebuild,v 1.7 2014/04/12 10:44:30 zlogene Exp $
EAPI=5
@ -12,7 +12,7 @@ DESCRIPTION="Error/exception handling in an OO-ish way"
LICENSE+=" MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RDEPEND=""

1
dev-python/configobj/Manifest
Unescape View File

@ -2,3 +2,4 @@ DIST configobj-4.7.2.zip 143618 SHA256 332a0d20d4d736d521d95cb2cf069b1ac7c858985
DIST configobj-5.0.1.tar.gz 32840 SHA256 ae0200a5707b2a63f2ed4ffbe211d603b36bb8a0407b74cb224487456e8138c3 SHA512 97369bf8adacd1946b27cba18a5966f136375605e8b9e270dee8a224ee8e09d09c094acd540602cbb500a0034ad8561468de14ad10fdfce62ec489d8a8c5591d WHIRLPOOL ab9be8f7d89f9afb14f0dae9a3fd11d74a429a37bf0ca889f8564b20971db09bb76b8ccfaaca6f9da95f3cf811a3aa593b5722434b157d1e3d99e9aa6fa9f420
DIST configobj-5.0.2.tar.gz 32973 SHA256 13c062852322079ecfcab030ef384ade0da9cbe8578fc84afbcfdbe036c58773 SHA512 09ea988babc8bc8c6d3cdc66679f1d953bfd262704712d2dbce920008f06c00cfcd42456a439b66e8ae678d8f25102b72c1c86daa34b04413fe24888c5f166ce WHIRLPOOL 9b8d33b0ef151a412ee8f09228aee0a22c428001d7870398563ea9a46d4f3579581529c625d8f98e25857ab45e0bd62d298be9782e498c4d85608e727a37b0e2
DIST configobj-5.0.3.tar.gz 33155 SHA256 c15b45de09207fcd3bbaeaa3b81267d7e1ee66a43e97e89a628e4d43de0e9598 SHA512 d1bc208d18ed3a9679bc61895c05afc008b43fb01b3071420d53dcb110f7fa8b89e84a8e98e29d42a11873aec0c8df2866e1c0606ef83f3de9daac08f8d72335 WHIRLPOOL ce7e26d9634bcea9a3fc9fb1c165101368cdb17666836018df8bf16f2312d41be2b1cebb04363011b8d404fdfd5c7f52c9f58f8b156b73d3e3eb614458d0b53f
DIST configobj-5.0.4.tar.gz 33205 SHA256 263b85d384356ba220bd8d532a4bf69bdd10b5dd932f9bd9a4e9be1ef4b453e0 SHA512 a64e933ed0f7566fb3e53718b76f1ddc8aa913409f145547ab974c245e0893a5ebd32c3b5d0c2103643e9ccb5f92bc6fcc5430b6318a2d5debc406486ed6dec3 WHIRLPOOL fc8fbb516ee03cceb53dcd6d3fb78a90884d7362836a094ece6c9147cb81c888586feb05de24222901710a3b125839bd9e64e8a9b5e21eb8b3742e837be91454

22
dev-python/configobj/configobj-5.0.4.ebuild
Unescape View File

@ -0,0 +1,22 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/configobj/configobj-5.0.4.ebuild,v 1.1 2014/04/12 05:06:25 radhermit Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
inherit distutils-r1
DESCRIPTION="Simple config file reader and writer"
HOMEPAGE="http://www.voidspace.org.uk/python/configobj.html http://code.google.com/p/configobj/ http://pypi.python.org/pypi/configobj"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
python_test() {
"${PYTHON}" validate.py -v || die "Tests fail with ${EPYTHON}"
}

21
dev-python/fuse-python/fuse-python-0.2.1-r1.ebuild
Unescape View File

@ -0,0 +1,21 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/fuse-python/fuse-python-0.2.1-r1.ebuild,v 1.1 2014/04/11 22:28:44 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} pypy )
inherit distutils-r1
KEYWORDS="~amd64 ~x86"
DESCRIPTION="Python FUSE bindings"
HOMEPAGE="http://fuse.sourceforge.net/wiki/index.php/FusePython"
SRC_URI="mirror://sourceforge/fuse/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
IUSE=""
RDEPEND=">=sys-fs/fuse-2.0"
DEPEND="${RDEPEND}"

5
dev-python/hcs-utils/Manifest
Unescape View File

@ -1,5 +1,2 @@
DIST hcs_utils-1.1.1.tar.gz 7044 SHA256 9e9b44c8902d9064c19ddc119eb27c60317ec76863b2189ad5faf0867a5870b1 SHA512 570ab73c41117685b6afe79d798e0f8b2e885ffa8f9027e9189b8a99f55b5f0bfd68f7a951fa97c4beaf3013c65544e4ba3a8351dd312a867a45c5446a4dbdf0 WHIRLPOOL b7971e8f86738a551de75c787e1e00125f6e225c88129a5227937a7410c3cbc37e5758bd9a6ecf50c7afd47c5c04e0cb053aa0d37c6ed1e4ea87632d789fa44a
DIST hcs_utils-1.2.tar.gz 10025 SHA256 f342d9712709cdcf1bb58750bf9573cc89cff20c47f4aaee8d9e2f53af3897d0 SHA512 382c2b27aa8dd4b5bb6f344c04a19e339dea8efc974e019202f1a37173da4399326db2ce1a1b0b45dbc56995101f78fa5123d01cfea5a50168b66ac043ee4ba4 WHIRLPOOL 7ec033a08fb2122fc38427eb09be598654a7b74a1e15fd3ecfe55c953c2c13b288c7cbd662a166bd74e8e11c33fa28f28821be47dff33dbb590c0ab0afad579d
DIST hcs_utils-1.3.tar.gz 21999 SHA256 b03fe7fc1fc3877ec810297bfc550f7cce58cf1f62bc464e348846ad01739255 SHA512 49f7096c339463dde586592ac06dea6f7e3a955c42ab5bd49341ac276d727c7033fa3c17f36d1268ade3d6661fd123ce9a49ba47fbf855ea13d2ab2b46888a27 WHIRLPOOL f00125e833f1575a6e3c9a873eead83275e27c07d469131cefcb79e834f7e59b66426c87e3588e5a192360737ede02be6d26879cedf8d784fba11cf7438f2bfd
DIST hcs_utils-1.4.tar.gz 22995 SHA256 aaecde5f01e975b670e3cb53442caee94dcfbfef4a720b5e5cd9aec8e3393c15 SHA512 f9848b805e7891683c7b6b7ee8de53313d038af13b5e2d745441445681761aa615d76d9f769aca4560828878332bb1c54d85fda82b080d18042d26a5edea84cf WHIRLPOOL babf8cb66e151974e3913078c1b0225334d01133828a31916a613b6968170297862eb1a0da60e06d0447c6394a62e8f7a57101495292738f460f86fb7eea7f2b
DIST hcs_utils-1.4rc5.tar.gz 22970 SHA256 c38a023e6342e44f25eb185b4fe5922c3dc1ccf1ce134b721e113a450af78657 SHA512 c662de7727b34ea68c1b3167c1027e3d7ea17b0a8e4c86ff66a5aa82a2d9475f32b9f434f2ecc4bd5d46c053fdbe7b3940d773ac61721acc338f35369a9e3053 WHIRLPOOL 1e0ca76291137da0433ffb4090a1808ff9a7898b40f68ad5b0da812675ee9ac3dd2808d7cfe14124415fcd6c2390dcc7724c5d9d59c4c63b9e8c5a84a9a5d0e2
DIST hcs_utils-1.5.tar.gz 23316 SHA256 745614347855f8edc7fb1659032166f0a2285cfc8383607aa3f1bf9959525fb4 SHA512 9a8fdddc47e5b4f89d52b59af66594e9b9a3adcf9d0ca5894111a0d359e8c18930e2d38027acfacadbdbf874a281d0f2ce88b310dacbab1f2a39c03bb2fe6fbf WHIRLPOOL 1ee476f1112557b8808d6cb5163b419d3b86db8b64d49bc9bf34f878eb0ba0e14ff278dad599b2a7c51d015fb98bc92be0d0a361a372b668c18c9d23dfa09959

23
dev-python/hcs-utils/hcs-utils-1.1.1.ebuild
Unescape View File

@ -1,23 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/hcs-utils/hcs-utils-1.1.1.ebuild,v 1.3 2013/01/03 02:27:42 floppym Exp $
EAPI="2"
PYTHON_DEPEND="2:2.5"
SUPPORT_PYTHON_ABIS="1"
inherit distutils
DESCRIPTION="A library containing some useful snippets"
HOMEPAGE="http://pypi.python.org/pypi/hcs_utils"
SRC_URI="mirror://pypi/h/${PN/-/_}/${P/-/_}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND=""
RESTRICT_PYTHON_ABIS="3.*"
S="${WORKDIR}/${P/-/_}"

23
dev-python/hcs-utils/hcs-utils-1.2.ebuild
Unescape View File

@ -1,23 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/hcs-utils/hcs-utils-1.2.ebuild,v 1.1 2011/09/13 14:49:03 hwoarang Exp $
EAPI="2"
PYTHON_DEPEND="2:2.5"
SUPPORT_PYTHON_ABIS="1"
inherit distutils
DESCRIPTION="A library containing some useful snippets"
HOMEPAGE="http://pypi.python.org/pypi/hcs_utils"
SRC_URI="mirror://pypi/h/${PN/-/_}/${P/-/_}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND=""
RESTRICT_PYTHON_ABIS="3.*"
S="${WORKDIR}/${P/-/_}"

28
dev-python/hcs-utils/hcs-utils-1.3.ebuild
Unescape View File

@ -1,28 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/hcs-utils/hcs-utils-1.3.ebuild,v 1.1 2012/12/25 04:41:56 floppym Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7} )
inherit distutils-r1
DESCRIPTION="A library containing some useful snippets"
HOMEPAGE="http://pypi.python.org/pypi/hcs_utils"
SRC_URI="mirror://pypi/h/${PN/-/_}/${P/-/_}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
RDEPEND=""
S="${WORKDIR}/${P/-/_}"
python_test() {
cd "${BUILD_DIR}/lib" || die
py.test --doctest-modules hcs_utils || die
}

10
dev-python/hcs-utils/hcs-utils-1.4_rc5.ebuild → dev-python/hcs-utils/hcs-utils-1.5.ebuild
Unescape View File

@ -1,9 +1,9 @@
# 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/dev-python/hcs-utils/hcs-utils-1.4_rc5.ebuild,v 1.1 2013/06/23 04:51:55 idella4 Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/hcs-utils/hcs-utils-1.5.ebuild,v 1.1 2014/04/11 11:50:47 idella4 Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7} )
PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
@ -25,6 +25,6 @@ RDEPEND=""
S="${WORKDIR}/${MY_P/-/_}"
python_test() {
cd "${BUILD_DIR}/lib" || die
py.test --doctest-modules hcs_utils || die
pushd "${BUILD_DIR}/lib" > /dev/null
py.test --doctest-modules hcs_utils || die "Tests failed"
}

1
dev-python/logbook/Manifest
Unescape View File

@ -2,3 +2,4 @@ DIST Logbook-0.4.1.tar.gz 96055 SHA256 5aef26127b55187c8109492c10f71f67c2706e940
DIST Logbook-0.4.tar.gz 65470 SHA256 3f5942e841c3b77e1b0b00a4cca4197db76bd0fe0356851f30f0a58a9494ba66 SHA512 dd066bc7332cac975cc655918a0e09b6cbe310fdf97d8b8a2d4246be435c06d16d48085a771adf2a12206b2ea5248506d34727b7b3783c07a4d37cdd859652dd WHIRLPOOL 22d501be6eea0733e9ed9634663bca73b7e1c7d2154d98660fe501cebba7820f3f602b18f04ef5c0db70b99cc63ad2d3a3b1e630d7df64d0505abafb1d68ffcd
DIST logbook-0.4.2.tar.gz 99723 SHA256 fa1f96672c3f1b6f71f9eb5dcb152e488c11310cec46371c793440955cffa6e8 SHA512 17c05967df9333fb3b42a6dd2cbb0ee356878ea8dc38ef19b2bdbc39c5bf7f49e52841b36f8857c3a0013e79bd41f6b1334f25d466207f8073df97ee96a73a03 WHIRLPOOL 880b85c0f1077a3a980816e48468aa9f8fa76df185694692717e4b08d1e07164d4b4c8ea8ca9fec9f47214ad8927a518d68914a8aadf9311bb7a88f83b0fa5b1
DIST logbook-0.5.0.tar.gz 99117 SHA256 b67b8ac7972163a2eb00f2462b474d4f149449fccb1015d61467baf279499f9f SHA512 60f7849acf686ffe4d071da6a833c227606b06194bb0c4bb67172a71cbca3c1cb2f56fb690dca8a28037d1323b66f489d050f647ba67117b074215c57641b39b WHIRLPOOL 9b2aad3f786db2c741d878b977975793ea655c4303629089061fe7010b4f3d08ff97fd4d1ac6d3503dc79255e64b208c03920078ef3294982569a512cf7eafca
DIST logbook-0.6.0.tar.gz 101326 SHA256 2e9c70b57cf536e50e5f1236480ec60020f8b9816560047ca7cbc025da247441 SHA512 6f97646c37b6e32fed9c623a26077f87282d248e75507904afca3b261d4bc5a60d5c5f4a7e146aceb3e61f152372a817f808f529aa0701594e0108ffe966d15a WHIRLPOOL 0e403721782e6e58ad885602a549616d0290337bd20128ec94fd297befb883271ef0d7741de6004593d4a4abd3849e3a9e2b9811f0f8a452e87e76fdef838ede

42
dev-python/logbook/logbook-0.6.0.ebuild
Unescape View File

@ -0,0 +1,42 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/logbook/logbook-0.6.0.ebuild,v 1.1 2014/04/12 00:16:50 idella4 Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_3} pypy pypy2_0 )
inherit distutils-r1
DESCRIPTION="A logging replacement for Python"
HOMEPAGE="http://packages.python.org/Logbook/ http://pypi.python.org/pypi/Logbook"
SRC_URI="https://github.com/mitsuhiko/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc test"
DISTUTILS_IN_SOURCE_BUILD=1
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
test? ( dev-python/nose[${PYTHON_USEDEP}] )
doc? ( >=dev-python/sphinx-1.1.3-r3[${PYTHON_USEDEP}] )"
PATCHES=( "${FILESDIR}"/${PN}-0.4.2-objectsinv.patch )
python_compile_all() {
use doc && emake -C docs html
}
python_test() {
# https://github.com/mitsuhiko/logbook/issues/101
if python_is_python3; then
nosetests -e test_mail_handler -w tests || die "Tests failed under ${EPYTHON}"
else
nosetests -w tests || die "Tests failed under ${EPYTHON}"
fi
}
python_install_all() {
use doc && HTML_DOCS=( docs/_build/html/. )
distutils-r1_python_install_all
}

1
dev-python/markdown/Manifest
Unescape View File

@ -4,3 +4,4 @@ DIST Markdown-2.2.0.tar.gz 236894 SHA256 98e1b0a0b2f87b8310d2060a560f427c24ee16c
DIST Markdown-2.2.1.tar.gz 260043 SHA256 f8b9a1efceab71afe9336a7c456fde36bfb0f505fb664ebb7f3dd44eddab44b6 SHA512 aa975a9d015e3e1320f35381c7e83e1f355222a3c0096e65ce4f1a1fa253fe0e3389ce1b3786b1cf40f4160863ede39d1081c655efe1c24132a766f02418fd61 WHIRLPOOL d455bee3ae25322bcaffa27f4f455bc5c1473aab3aeb8d983484275303011a9489502ac5f919539b67e423a3891aa5309c427050ca525af26a65cc8c776e064a
DIST Markdown-2.3.1.tar.gz 267131 SHA256 ffebd9385717aba00ff4e95b705b7693ddf12a7d483483d441218b6d3f4cf290 SHA512 4ceb0405825fb20f4432134b7904d402b41b1d95c18e10e484a71011a1429ae83804437ed94ce60315fb48664f096a8f5d8d9e0111cab332fe5c978d62d569a6 WHIRLPOOL df7d6b7046949fef03f4e65e996bc086bc0f57272e3b91387dcb2243800cbbba4f3395adb770bd4f89c8466dab26a1fe15ec122bca3dc6e8486e07f9e3b70e9e
DIST Markdown-2.3.tar.gz 268514 SHA256 b2175e573eedf4cff47f116f06a53ba50aeb0656ff58a9577e0547cd5b0be3ab SHA512 61f26a32d26a9085f6aec3133a43e6c4cc02ef5a710f136e141f9719c7673818bce413b2801bb5012b078155ae1f993487fb36c74c61276bad0378eb82025131 WHIRLPOOL 277b31ef9ff47cf77861d55cec314fc9c54ef33a62a13171d73066104bc35215514309611b8f5034b24efd8011c7b442623e7717c36b698ca56471d5e5bd8cde
DIST Markdown-2.4.tar.gz 260026 SHA256 b8370fce4fbcd6b68b6b36c0fb0f4ec24d6ba37ea22988740f4701536611f1ae SHA512 95ecaa0d916bf6f6f46caec3f1de7c2fffe3abfc3e9acf9dbbd0ad7fb998b5a33920c29d107d69cdb8b6e197cac36bf221bbac6b4e0fe4b7505c59e1eb45ca7f WHIRLPOOL e05e620f732f1d717d3c1637064e043005cc8479e66ce67f7089a4c54c0bfa5f4ac0f9271c1ca23222904166251fc2c8c52210ec4293cc447b0718c340ab46bc

60
dev-python/markdown/markdown-2.4.ebuild
Unescape View File

@ -0,0 +1,60 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/markdown/markdown-2.4.ebuild,v 1.1 2014/04/12 04:16:19 idella4 Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy2_0 )
inherit distutils-r1
MY_PN="Markdown"
MY_P=${MY_PN}-${PV}
DESCRIPTION="Python implementation of the markdown markup language"
HOMEPAGE="http://www.freewisdom.org/projects/python-markdown http://pypi.python.org/pypi/Markdown"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="|| ( BSD GPL-2 )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-linux ~x86-macos"
IUSE="doc test pygments"
DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
RDEPEND="pygments? ( dev-python/pygments[${PYTHON_USEDEP}] )"
S="${WORKDIR}/${MY_P}"
python_prepare_all() {
# do not build docs over and over again
sed -i -e "/'build':/s:md_build:build:" setup.py || die
distutils-r1_python_prepare_all
}
python_compile_all() {
use doc && esetup.py build_docs
}
python_install_all() {
if use doc; then
local DOCS=( docs/. )
# templates which we don't want in docdir
rm -f docs/*.{html,css,png}
fi
distutils-r1_python_install_all
}
python_test() {
cp -r -l run-tests.py tests "${BUILD_DIR}"/ || die
pushd "${BUILD_DIR}" > /dev/null
if [[ ${EPYTHON} == python3* ]]; then
# don't use -n: it causes writes to hardlinked files
2to3 -w --no-diffs tests || die
fi
"${PYTHON}" run-tests.py || die "Tests fail with ${EPYTHON}"
popd > /dev/null
}

1
dev-python/markdown2/Manifest
Unescape View File

@ -2,3 +2,4 @@ DIST markdown2-1.3.1.zip 120433 SHA256 d20e819327af693d7036b981bd23f3e5952e7c0ef
DIST markdown2-1.4.2.zip 124382 SHA256 0187f8758fc57c7faf534fb1ca49092dce860ce6052693aab2e040ac5352582a SHA512 a4d84c1e704524e10766faa1e4a8d2d596857ba5bf51f282f738424372356aaa32182be80eab6bd8cc06569d08c73b268c7b1997b3687036dc9013d496305e3f WHIRLPOOL fb915dbc66e848d79fbf872add525124400a5b131809ff90fa76ee1f65eb55eebfb57093af5b7a5903b17c3a1cbde64ec3189d133bfdbbf807d865f875193d7c
DIST markdown2-2.1.0.zip 128768 SHA256 8291805f3412bbcb44a26b51edd76a5b77428af35b325e9db97607a859e7ddbb SHA512 8d477504caee1dab3684ffd7176c0dd9fa21675886f2c9474d105401fe073e10d7181fc7722a7f6266fdd94543a446d690551d7c63b97dde8f5315863bb43661 WHIRLPOOL b2593e331bcd89fcf7d235ea125fa973761d0fd43c52068c430bbc08564c2e727e3e2d9c17a4a6fd8527e23fa8144fc598de2b6a0027dc8858330de402cb4499
DIST markdown2-2.2.0.zip 132265 SHA256 aff2a14966f20bf68936fabb4838519e72a5c0298d8f266966d6c2209cbd9375 SHA512 783483c1f77f766f67591264c80c48a30bbe1613cae1ef65602d52ba42678309bf76b00f2b7f623aaa88973428c990ac6218cb454e3a5e65891d866da179c91a WHIRLPOOL 8476e08ce9948c298d279023865e6fd12d04f22db5cb2b1c00d980b9d063fb7749b97dc0ce834dc2179b9e25b10ea47168b3b07fff428d0f2e6e02d367123625
DIST markdown2-2.2.1.zip 138508 SHA256 1e529b016e094402ba1a632f9db77eb168cd085d7cb81309a55b33c3e72999b9 SHA512 a97fbb80c7b7b7ebc7e3048e1eecc97f3df8052db4f5e7cf38b4f8e170c102dfe732070bcfe85de0331a27af8ea9fa4be81c7b80f37f3cbd5b11acc0489f1561 WHIRLPOOL 318a97e4a91d6054d3de6479f6ea5cd93a2f56f3e5e732bed70547e7594e11ffce3cb927e34530a79ed5996caf7900959f15da66ad1d1f12a3235ead6d9d39d8

32
dev-python/markdown2/markdown2-2.2.1.ebuild
Unescape View File

@ -0,0 +1,32 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/markdown2/markdown2-2.2.1.ebuild,v 1.1 2014/04/12 04:47:12 idella4 Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_3,3_4} pypy pypy2_0 )
inherit distutils-r1
DESCRIPTION="Python Markdown language reimplementation"
SRC_URI="mirror://pypi/m/markdown2/${P}.zip"
HOMEPAGE="http://github.com/trentm/python-markdown2"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
RDEPEND="${DEPEND}"
python_prepare_all() {
rm -f test/tm-cases/issue52* || die
distutils-r1_python_prepare_all
}
python_test() {
cd test || die
"${PYTHON}" test.py || die "Tests fail with ${EPYTHON}"
}

1
dev-python/markupsafe/Manifest
Unescape View File

@ -1,3 +1,4 @@
DIST MarkupSafe-0.12.tar.gz 10939 SHA256 2670f759d00b3df50625b493b7bd20f808024dab278eecc2c8b890b4e8083757 SHA512 41a566ab39a494154c8b3bcdf8a4f1d4a028ec2982a24e9e0598dd4a13241f4fe77af22926627b0ec9437a4d214813f4ec5395243b6c4137b0a50d7fbe877076 WHIRLPOOL 682d12aa314515f25895b00a9dad66c0e117384a6e8e921b51750e679aa6ea9708b6cffe1f85a7380c1c96b419ece529f97455c13f3007e45b2e11f90cd9f276
DIST MarkupSafe-0.15.tar.gz 11265 SHA256 339ec04d20ad9cdccbfe9f38dce6182cc504ce789e5d0f9647eaa752f0f95300 SHA512 151f293272c41ea3d941c525bf5ec81faad8ad390e3d64691e6f73cba1428aaf949784a02996e1b782a6ff5311d13d7f1ea0fa5c2cce51e7c40c2fe98e32d7a4 WHIRLPOOL e7fc6be55ec1eea583b5ababf8b4e631dae4d3f9cc5eed56a7efff09ca03f3e76b9becb13ee165971e1220be304b8ba23cae3af560e812507da3a94f33a50d44
DIST MarkupSafe-0.18.tar.gz 11748 SHA256 b7d5d688bdd345bfa897777d297756688cf02e1b3742c56885e2e5c2b996ff82 SHA512 0438ddf0fdab465c40d9afba8c14ad346be0868df654c11130d05e329992d456a9bc278551970cbd09244a29c77213885d0c363c951b0cfd4d9aa95b248ecff5 WHIRLPOOL 5254f021625fcbf45c3bf94f10a69149a248ae316d0f2f58b34ae008f66bac276d033057dd4f10b79873a4fbcadbd1796afae53fba67593a6cc370e43d34b845
DIST MarkupSafe-0.19.tar.gz 11807 SHA256 62fcc5d641df8b5ad271ebbd6b77a19cd92eceba1e1a990de4e96c867789f037 SHA512 3fa91de4967394c16a948a401fc7ee024c5e617bd90f0b41c47021656a57087169a9d0ac8af34656c00e6696dc20c3501041eee03a49686034bb611ef6eba45d WHIRLPOOL a71d59238872d675eef101a6b1322c0bac0711f0ee03a64aa33ed8b87e27710220beeede2fc3474c4c6c9c67de3b68d069a31462d82596b696dba238f4a25bc0

34
dev-python/markupsafe/markupsafe-0.19.ebuild
Unescape View File

@ -0,0 +1,34 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/markupsafe/markupsafe-0.19.ebuild,v 1.1 2014/04/12 06:20:35 idella4 Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
inherit distutils-r1
MY_PN="MarkupSafe"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python"
HOMEPAGE="http://pypi.python.org/pypi/MarkupSafe"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND=""
S=${WORKDIR}/${MY_P}
python_prepare_all() {
local PATCHES="${FILESDIR}"/markupsafe-0.18-py3compat.patch
distutils-r1_python_prepare_all
}
python_test() {
esetup.py test
}

1
dev-python/mockldap/Manifest
Unescape View File

@ -1,2 +1,3 @@
DIST mockldap-0.1.4.tar.gz 20736 SHA256 2f6fa74f6d805945a2f3b49d2e579b0083f89969e5d72069cea394eb9c0295be SHA512 d698623576ff24c27bec634fcf439116d277715e6a787d54a0186a3f08ad18c63fcabf09c12a63118c6565f527da846f64fe9f61e7e397ca6c1472ccff200663 WHIRLPOOL 4aa830cfef4a21d4a4b9ac86379814ad346c284179109b8623a883dbf2bf957f5ea738f102fc0ce0b266e3dd5ffb4515a0dbbec56b527d1d9fbfd6a9e539bf1f
DIST mockldap-0.1.5.tar.gz 21005 SHA256 fddfed57848e0630c47c4d1d8267c5d9c68c3d89683131444973dcbf532fa4f7 SHA512 aeba82b1e3b1839e5b45cdfdf20b34a0c95f7ec9f498b06301fc756cddeb8af91e79313d0bf4d8bbd53b0bdda05ce7371ad294cc736828292fc53ae518a00607 WHIRLPOOL 0b97593379e7578e11fff270956f0ceb5e2261ffacc65dd7d987dcaade6c1529327fc1aa4d8884a4a54effee0a033080f7691299d71befbfad742531854a58a3
DIST mockldap-0.1.7.tar.gz 21341 SHA256 365002535220c9123749bfbfc89959bae72e078b334bc11b06e0c618c85274a9 SHA512 f27b1b5483f63f7863495a103f74b5e18ef0393267b71df62117db99c9c09dab324f1ef1ee22aa7f147d6ac5fecf5aa98273e3a4999a07888ffdd5aed422d22f WHIRLPOOL c2636b5eb03358d195907c0a608022f140ca2167f9f68a888e2789a929554d1503209e0186dda6a708ef095ac3e195afd6e7e41250d14b1e8d84281e2ac46529

12
dev-python/mockldap/files/mapping.patch
Unescape View File

@ -0,0 +1,12 @@
Disable un-needed d'loading during doc build
diff -ur mockldap-0.1.7.orig/docs/source/conf.py mockldap-0.1.7/docs/source/conf.py
--- docs/source/conf.py 2014-03-08 00:51:00.000000000 +0800
+++ docs/source/conf.py 2014-04-12 16:04:52.113446583 +0800
@@ -28,7 +28,6 @@
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
extensions = [
'sphinx.ext.autodoc',
- 'sphinx.ext.intersphinx',
'sphinx.ext.viewcode',
]

48
dev-python/mockldap/mockldap-0.1.7.ebuild
Unescape View File

@ -0,0 +1,48 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/mockldap/mockldap-0.1.7.ebuild,v 1.1 2014/04/12 08:35:10 idella4 Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
inherit distutils-r1
DESCRIPTION="A simple mock implementation of python-ldap"
HOMEPAGE="https://bitbucket.org/psagers/mockldap/ https://pypi.python.org/pypi/mockldap"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc test"
RDEPEND="dev-python/funcparserlib[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
dev-python/python-ldap[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
test? ( dev-python/passlib[${PYTHON_USEDEP}] )"
# Disable un-needed d'loading during doc build
PATCHES=( "${FILESDIR}"/mapping.patch )
python_compile_all() {
use doc && emake -C docs html
}
python_test() {
esetup.py test
}
python_install_all() {
use doc && local HTML_DOCS=( docs/build/html/. )
distutils-r1_python_install_all
}
pkg_postinst() {
if ! has_version dev-python/passlib; then
elog "Please install dev-python/passlib for hashed password support."
fi
}

42
dev-python/nose/files/nose-1.3.1-pypy-test.patch
Unescape View File

@ -0,0 +1,42 @@
https://github.com/nose-devs/nose/commit/0181572a64195a8fa1c6c867ae6c61a79a9606ca.diff
diff --git a/nose/util.py b/nose/util.py
index dcb5fef..e612696 100644
--- a/nose/util.py
+++ b/nose/util.py
@@ -447,11 +447,10 @@ def try_run(obj, names):
if func is not None:
if type(obj) == types.ModuleType:
# py.test compatibility
- try:
- args, varargs, varkw, defaults = inspect.getargspec(func)
- if hasattr(func, '__call__') and ismethod(func.__call__):
- args.pop(0)
- except TypeError:
+ if isinstance(func, types.FunctionType):
+ args, varargs, varkw, defaults = \
+ inspect.getargspec(func)
+ else:
# Not a function. If it's callable, call it anyway
if hasattr(func, '__call__'):
func = func.__call__
diff --git a/unit_tests/test_utils.py b/unit_tests/test_utils.py
index 2bd837c..cd9ba6e 100644
--- a/unit_tests/test_utils.py
+++ b/unit_tests/test_utils.py
@@ -1,4 +1,5 @@
import os
+import sys
import unittest
import nose
from nose import case
@@ -168,7 +169,7 @@ def __call__(self):
class Bar_m:
def __call__(self, mod):
pass
-
+
foo = imp.new_module('foo')
foo.bar = bar
foo.bar_m = bar_m

5
dev-python/nose/nose-1.3.1.ebuild
Unescape View File

@ -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-python/nose/nose-1.3.1.ebuild,v 1.2 2014/04/10 09:06:07 idella4 Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-1.3.1.ebuild,v 1.3 2014/04/11 13:48:26 idella4 Exp $
EAPI=5
@ -27,7 +27,8 @@ DOCS=( AUTHORS )
PATCHES=(
"${FILESDIR}"/${PN}-1.2.1-skiptest.patch
"${FILESDIR}"/${PN}-1.3.1-python3.4.patch
"${FILESDIR}"/${P}-doctest.patch )
"${FILESDIR}"/${P}-doctest.patch
"${FILESDIR}"/${P}-pypy-test.patch )
python_prepare_all() {
# Tests need to be converted, and they don't respect BUILD_DIR.

7
dev-python/psutil/Manifest
Unescape View File

@ -1,9 +1,4 @@
DIST psutil-0.6.1.tar.gz 138456 SHA256 d665a4cc58c9a5d207fb0dc9869fc0ee10f4f66ad885e84886ef6339ccce0a6f SHA512 83fb9c92731bcc084be2bc0a9b39c8c62c28c9f9ed5a24666b6ebbf0e9164d95032a8ce9d8e8866e8e55dc39e456e51c122ff530129c6cf6faaaf59efcf4d950 WHIRLPOOL e120c1deeebb6a307d313b30caab18cc778bd3b984d56e78f517f401a48353d862afc5cf3ced03b999ea381b42ad50bb14e42e682c87e36cb99326cbd79e22db
DIST psutil-0.7.1.tar.gz 140287 SHA256 c56a9450ecf6a459103c609752e2e5e620e1f19b1d5150f2afcadc6d62d1b55d SHA512 3eb64bc94f320ef5a807c18c842f1a655f616d1de20a412d70ba7489bb388e0e239c8a5f72aa6af935d87102ee0a2995cd7bdd05727d451189a1989e5595c80d WHIRLPOOL 538d645e3ecde904647d98a9eb7e0d84a0eb48a807ee374a8f8279178ef0b21ba8009724e9b923095907eaebfc0d60c05e7782efb8cf427c0edb0f3dc39a215d
DIST psutil-1.0.0.tar.gz 159463 SHA256 8ca2b61e7a2d2d4cbfbbbda71b293b9a353f5cffbd1e2aa3081ae4a7cdc1979e SHA512 d812922c0a3d2bafa10690ac7786085e96624d850e968781cffeaa7ac0f9b187dcfa8596d999193e4e524dacb70a18014561144525a671c4dd6f76286f3e7112 WHIRLPOOL 746366d796827becb197bf55e4684e31038b7e4d910fe010a34ff180e4a24b86fd8a0d6c939cdac5904680da3fa6b99358958b9e8d486ebed1e7efdfaa09d3a7
DIST psutil-1.0.1.tar.gz 159515 SHA256 2ec4a05c4ee352def25a1df53dc5d1d8203a051b3cf3ae92d3e93810e1813fff SHA512 9b834b94b81a7058d42271cf13e87d7676153528c83778ad43cb54ab893c8b7268506f56b280e598d6edb9d3e9b7c4c7b2ff1f0d4b4aaa6c802fdc4ce7e546af WHIRLPOOL c167cf9c9fdc223e6ca144b431c002659a5f7a47f8d97cfffaa2b2168ffaea59eb0712210d9962ce27744ad0144a676ea71c347d41ea40df116c25a2c5772bff
DIST psutil-1.1.0.tar.gz 163785 SHA256 31b4b411d3f6960d26dac1f075709ff6d36f60216bf1f2b47fc4dc62a2d0aa6f SHA512 5c1a6bf3b1e0fc17c1a65f09597f8cb6d503f35811781ab9baa55615117a87d172ad998a1e267eef1f68d74d9ad373d9a1a900ea8fa7b38abdfb4fa7eceb03d6 WHIRLPOOL ef883d6e94265c06ea56c51dd5b13db05b27baa31874d5bf483c6150c439c092879b26cd70f06eec84d8e4f2d230fb94e00ac53cb10f86a0fa925530a9952fe5
DIST psutil-1.1.1.tar.gz 165467 SHA256 a5201e4c2a9b57e9e5d8de92b3a4006d093eedd9b56915b8279f365aaedd0f48 SHA512 b611e6674b7270752188e53e5d1f4bc2e2b629cd73e025ebbe4d938af9deb94e4a5fed9fab21b554051ce1206866b2ed7d0474325134a612fd2c60bd16b16ca0 WHIRLPOOL de5ab234ddf37846a4a84c7a7aabb478d195720cf23fc2ed9b1e42e9a0cf358b73aadd3db76a3a0da8e4b2f0f93774bc56f0623fcebba91f03767b45a94882cc
DIST psutil-1.1.3.tar.gz 165550 SHA256 5e1164086a7ed3b863ebd12315d35086e22252b328401fce901a0862050ef98c SHA512 038e53185854b0c31cc37ad8f0518c80e46a4abfc7be91f04cac86b01feb7320eb59fd00dd4b32ccf0c381218b07c93bd9ba9335e7b2383898cd87b4a705674f WHIRLPOOL 9a53af3f2b7f9c93f99b10a8f5ffebca61814aee257a58090a027a79dbd82ab5179de97662932a4f4c02f5105400a8158bd9c38dd7151f04ccad465335e5b592
DIST psutil-1.2.1.tar.gz 167397 SHA256 508e4a44c8253a386a0f86d9c9bd4a1b4cbb2f94e88d49a19c1513653ca66c45 SHA512 9faec6c4139f677252b30f4a8793484658d888535428dfb4e316821bb5f246e1832baedd8704279a7e0da7096d539f1a8dcd49f2d61d943f9299e9204ff47d81 WHIRLPOOL e6b13df0c6f70e5d92a88bd540ad2e2f4d670463e1ec815a3eb3b6b009715dd7c0a96b73a03c5819fb3eb3b30f63a1299d6668ffef992a408d8d1b78d33dea43
DIST psutil-2.0.0.tar.gz 207168 SHA256 38af34b0f40a4f50988a7401b7111ae4468beb5bcce0fbae409504dd3d5f2e8d SHA512 5b73471111dc1b17afa83a9a0d69ff2856839c0adcff88b1af521d66df997b24ec2a9139c97286566caa1f070dc4a0df13a096cda16c7c7913bfe231fa875a81 WHIRLPOOL bcbc20f56793031d2a48d87f96e80f22ab11beeb00a34e6899df7020dde5caf66e1e7a564bb34638caaf6456d4fea1b05b28a2aca9e26b3bd05eea2297d4491b
DIST psutil-2.1.0.tar.gz 211640 SHA256 d1e3ce46736d86164b6d72070f2cbaf86dcf9db03066b7f36a7b302e334a8d01 SHA512 6f6b64d38b2f8fec0359135119f14eb01f7a45662ee3044b504122b8df9ee5f6966ffa46988b2b6d3c821982259a6aa386f3c79d77b664f71d5bbfb7c49ad5ae WHIRLPOOL 26ee5b705cb164e2651aff04a201eac81b4edf3caa7f0302a97dd1eb9600a8d24a9ffa46d274b5793d6f56b1bffe581e537febac614171f8148cfbf38396bcbf

26
dev-python/psutil/psutil-0.7.1.ebuild
Unescape View File

@ -1,26 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/psutil/psutil-0.7.1.ebuild,v 1.5 2014/03/31 20:48:21 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
inherit distutils-r1
DESCRIPTION="Retrieve information on running processes and system utilization"
HOMEPAGE="http://code.google.com/p/psutil/ http://pypi.python.org/pypi/psutil"
SRC_URI="http://psutil.googlecode.com/files/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
#RESTRICT="test"
#http://code.google.com/p/psutil/issues/detail?id=379
python_test() {
"${PYTHON}" test/test_psutil.py || die "Tests fail with ${EPYTHON}"
}

24
dev-python/psutil/psutil-1.0.0.ebuild
Unescape View File

@ -1,24 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/psutil/psutil-1.0.0.ebuild,v 1.3 2014/03/31 20:48:21 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
inherit distutils-r1
DESCRIPTION="Retrieve information on running processes and system utilization"
HOMEPAGE="http://code.google.com/p/psutil/ http://pypi.python.org/pypi/psutil"
SRC_URI="http://psutil.googlecode.com/files/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RESTRICT="test"
python_test() {
esetup.py test
}

24
dev-python/psutil/psutil-1.0.1.ebuild
Unescape View File

@ -1,24 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/psutil/psutil-1.0.1.ebuild,v 1.5 2014/03/31 20:48:21 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
inherit distutils-r1
DESCRIPTION="Retrieve information on running processes and system utilization"
HOMEPAGE="http://code.google.com/p/psutil"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RESTRICT="test"
python_test() {
esetup.py test
}

24
dev-python/psutil/psutil-1.1.0.ebuild
Unescape View File

@ -1,24 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/psutil/psutil-1.1.0.ebuild,v 1.2 2014/03/31 20:48:21 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
inherit distutils-r1
DESCRIPTION="Retrieve information on running processes and system utilization"
HOMEPAGE="http://code.google.com/p/psutil"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RESTRICT="test"
python_test() {
esetup.py test
}

24
dev-python/psutil/psutil-1.1.1.ebuild
Unescape View File

@ -1,24 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/psutil/psutil-1.1.1.ebuild,v 1.2 2014/03/31 20:48:21 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
inherit distutils-r1
DESCRIPTION="Retrieve information on running processes and system utilization"
HOMEPAGE="http://code.google.com/p/psutil"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RESTRICT="test"
python_test() {
esetup.py test
}

10
dev-python/psutil/psutil-1.1.3.ebuild → dev-python/psutil/psutil-2.1.0.ebuild
Unescape View File

@ -1,9 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/psutil/psutil-1.1.3.ebuild,v 1.2 2014/03/31 20:48:21 mgorny Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/psutil/psutil-2.1.0.ebuild,v 1.1 2014/04/12 04:53:26 radhermit Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy )
inherit distutils-r1
@ -14,11 +14,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
test? ( dev-python/nose[${PYTHON_USEDEP}] )"
RESTRICT="test"
python_test() {
esetup.py test
nosetests -v || die "Tests fail with ${EPYTHON}"
}

4
dev-python/psycopg/psycopg-2.5.2.ebuild
Unescape View File

@ -1,9 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.5.2.ebuild,v 1.1 2014/01/14 05:46:18 patrick Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.5.2.ebuild,v 1.2 2014/04/11 19:51:10 sdamashek Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
inherit distutils-r1 flag-o-matic

1
dev-python/python-caja/Manifest
Unescape View File

@ -1 +1,2 @@
DIST python-caja-1.6.1.tar.xz 248488 SHA256 abee1db422c81ee39bbd305a4fae1b5aa2c6f9c0ca09aae353f3635a87877290 SHA512 d494c99b3663cbaf94e221f4dbe125dd6851fb62402e7a0a9776d07941ea93e6f0314c726b533ad5c97d886aede529ae2eab92da988c8b6b93747405b5373987 WHIRLPOOL 4bb7aaabf3133287c027a73a82a1b4ac73685aa36564cf8440c2377fc292d4983ab5d60b33c832fdd2998a898ef9e012ae574333e21ff224d21f9d7ee9dd9184
DIST python-caja-1.8.0.tar.xz 250752 SHA256 bb872b99a4722af048990ffcd631e466dac808043bc02f7385e20845cf8b6d50 SHA512 571ee1016fb6d1d9a1e6f72da9b6959bad2734c24f5b2b2ab6af477eeb7c931c36758b09f8a0dea536f6d8ec5366747855d58764f36f2e6778c4a30b4fdebcd4 WHIRLPOOL 621a964a892d749d3619fea85f4f91ec7de2dc00ecc46b28202035b4f948133a669d4e10163a0c2fb0f35ea6261a6834ef3f7c0a9f3f6db9d3e2592a92a9906e

55
dev-python/python-caja/python-caja-1.8.0.ebuild
Unescape View File

@ -0,0 +1,55 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/python-caja/python-caja-1.8.0.ebuild,v 1.1 2014/04/11 14:00:28 tomwij Exp $
EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
PYTHON_COMPAT=( python2_{6,7} )
inherit gnome2 python-single-r1 versionator
MATE_BRANCH="$(get_version_component_range 1-2)"
SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
DESCRIPTION="Python bindings for the Caja file manager"
HOMEPAGE="http://www.mate-desktop.org"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64"
IUSE="doc"
RDEPEND="dev-libs/glib:2
dev-python/pygobject:3[${PYTHON_USEDEP}]
|| (
>=mate-base/caja-1.8:0[introspection]
>=mate-base/mate-file-manager-1.6:0[introspection]
)
x11-libs/gtk+:2
${PYTHON_DEPS}"
DEPEND="${RDEPEND}
virtual/pkgconfig:*
doc? (
app-text/docbook-xml-dtd:4.1.2
)"
DOCS="AUTHORS ChangeLog NEWS README"
src_install() {
gnome2_src_install
# Keep the directory for systemwide extensions.
keepdir /usr/share/python-caja/extensions/
# The HTML documentation generation is broken and commented out by upstream.
#
#if use doc ; then
# insinto /usr/share/gtk-doc/html/nautilus-python # for dev-util/devhelp
# doins -r docs/html/*
#fi
}

35
dev-python/sclapp/sclapp-0.5.3-r1.ebuild
Unescape View File

@ -0,0 +1,35 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/sclapp/sclapp-0.5.3-r1.ebuild,v 1.1 2014/04/11 22:16:34 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
inherit distutils-r1
DESCRIPTION="Framework for writing simple command-line applications"
HOMEPAGE="http://www.alittletooquiet.net/software/sclapp/"
SRC_URI="http://www.alittletooquiet.net/media/release/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="dev-python/pexpect[${PYTHON_USEDEP}]"
RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${P}-testsuite-fix-from-r235.patch"
)
src_test() {
local DISTUTILS_NO_PARALLEL_BUILD=1
distutils-r1_src_test
}
python_test() {
esetup.py test
}

4
dev-util/dialog/dialog-1.2.20140219.ebuild
Unescape View File

@ -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-util/dialog/dialog-1.2.20140219.ebuild,v 1.3 2014/04/02 18:52:58 maekke Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/dialog-1.2.20140219.ebuild,v 1.5 2014/04/12 09:39:09 ago Exp $
EAPI=5
inherit eutils multilib versionator
@ -13,7 +13,7 @@ SRC_URI="ftp://invisible-island.net/${PN}/${PN}-${MY_PV}.tgz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="examples minimal nls static-libs unicode"
RDEPEND="

2
gnome-base/gnome-shell/Manifest
Unescape View File

@ -1,3 +1 @@
DIST gnome-shell-3.10.3.tar.xz 1520472 SHA256 4b14b9ffde08ccee6d972dea353b5f7ed8bbd12e52cb2252c31bcfe59d8242bc SHA512 d21d3da754d5e45f7c64da903a82dd96a616c201120fe816fef52f5cdf1fbc4a958c1b75b9628c4f05384c28b0bae9211a5a177da21c1e975bdd86efd450f948 WHIRLPOOL 9a230affb37d5f91dadea275de7c14b143d5be2997836fbd2c99d7c8a6325eea74fab889f680007b513093228636afad954ea2139488815920925b376fea9e6b
DIST gnome-shell-3.10.4.tar.xz 1521256 SHA256 e082f6847eedbbc474ffe4bcb3dfe51054eb0e4c5ddab440d39afed78526b726 SHA512 bb69942bb1ab97e896ed69b48360c99a1a870074b0bfe16dc546fcb3d23a970b95b7f3bd3f9bac85a73a0fc0c5d7c8b8c08054d28abb5aa80b7b79c918532167 WHIRLPOOL aa2678a9b19e2c92823b0d555d1b88869112796c3876433a3886086a22a25b4cb4c77908d7e82c76430fbfba535af0f2b9791b79be5c7aa3f57575c8c3372d4f
DIST gnome-shell-3.8.4.tar.xz 1517048 SHA256 547e571c67b1436a32715b016ee63c666afcafed9c5a2f76dc4ad3bcaebffa47 SHA512 e35ccf9b4a52c98754ef80712f489f660e355b2694c41165ab4c398a53935f7cad6f7d2a5655d03557684e93fb684dfe817767a12017c227a143b77785b3b073 WHIRLPOOL 72c6c25d53226f6336e3c0c214cc85c4f18aaa76557bc3599d3a579aeff9b46edb05be451d2bbab5713f6b3f0eba7e5b9a4d627786d0d639a4799c803946d439

41
gnome-base/gnome-shell/files/gnome-shell-3.10.4-activate-workspace.patch
Unescape View File

@ -0,0 +1,41 @@
From 0dab133fe578b3b12241ce6f01b58bc755088da8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Mon, 30 Sep 2013 19:55:26 +0200
Subject: windowManager: Activate new workspace before removing the current one
When removing the current workspace, the active workspace is changed
to the preceding one automatically before we change explicitly to the
last workspace. There is no good reason to change workspaces twice in
this case, we can avoid the first one just by changing to the new
workspace before removing any workspaces.
https://bugzilla.gnome.org/show_bug.cgi?id=709064
diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index 75be4c5..31b7d2d 100644
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -254,6 +254,8 @@ const WorkspaceTracker = new Lang.Class({
if (removingCurrentWorkspace) {
// "Merge" the empty workspace we are removing with the one at the end
this._wm.blockAnimations();
+ global.screen.get_workspace_by_index(global.screen.n_workspaces - 1).activate(global.get_current_time());
+ this._wm.unblockAnimations();
}
// Delete other empty workspaces; do it from the end to avoid index changes
@@ -262,11 +264,6 @@ const WorkspaceTracker = new Lang.Class({
global.screen.remove_workspace(this._workspaces[i], global.get_current_time());
}
- if (removingCurrentWorkspace) {
- global.screen.get_workspace_by_index(global.screen.n_workspaces - 1).activate(global.get_current_time());
- this._wm.unblockAnimations();
- }
-
this._checkWorkspacesId = 0;
return false;
},
--
cgit v0.10.1

199
gnome-base/gnome-shell/files/gnome-shell-3.10.4-broken-crosshairs.patch
Unescape View File

@ -0,0 +1,199 @@
From 713d4aa6c4a606c8479d7160e9df3fb79d7ec7f0 Mon Sep 17 00:00:00 2001
From: Magdalen Berns <m.berns@thismagpie.com>
Date: Wed, 5 Feb 2014 20:53:21 +0000
Subject: [PATCH] Magnifier: Restore crosshairs
This patch is to restore broken crosshairs so they may be used
once more
https://bugzilla.gnome.org/show_bug.cgi?id=723709
magnifier.js
---
js/ui/magnifier.js | 131 +++++++++++++++++++++++------------------------------
1 file changed, 56 insertions(+), 75 deletions(-)
diff --git a/js/ui/magnifier.js b/js/ui/magnifier.js
index 2a6ac38..96c12b2 100644
--- a/js/ui/magnifier.js
+++ b/js/ui/magnifier.js
@@ -57,20 +57,6 @@ const Magnifier = new Lang.Class({
// Magnifier is a manager of ZoomRegions.
this._zoomRegions = [];
- // Export to dbus.
- magDBusService = new MagnifierDBus.ShellMagnifier();
-
- let showAtLaunch = this._settingsInit();
- this.setActive(showAtLaunch);
- },
-
- _initialize: function() {
- if (this._initialized)
- return;
- this._initialized = true;
-
- this._settingsInitLate();
-
// Create small clutter tree for the magnified mouse.
let cursorTracker = Meta.CursorTracker.get_for_screen(global.screen);
this._mouseSprite = new Clutter.Texture();
@@ -86,11 +72,15 @@ const Magnifier = new Lang.Class({
let aZoomRegion = new ZoomRegion(this, this._cursorRoot);
this._zoomRegions.push(aZoomRegion);
- this._settingsInitRegion(aZoomRegion);
+ let showAtLaunch = this._settingsInit(aZoomRegion);
aZoomRegion.scrollContentsTo(this.xMouse, this.yMouse);
cursorTracker.connect('cursor-changed', Lang.bind(this, this._updateMouseSprite));
this._cursorTracker = cursorTracker;
+
+ // Export to dbus.
+ magDBusService = new MagnifierDBus.ShellMagnifier();
+ this.setActive(showAtLaunch);
},
/**
@@ -115,12 +105,6 @@ const Magnifier = new Lang.Class({
* @activate: Boolean to activate or de-activate the magnifier.
*/
setActive: function(activate) {
- if (activate == this.isActive())
- return;
-
- if (activate)
- this._initialize();
-
this._zoomRegions.forEach (function(zoomRegion, index, array) {
zoomRegion.setActive(activate);
});
@@ -452,68 +436,64 @@ const Magnifier = new Lang.Class({
this._mouseSprite.set_anchor_point(xHot, yHot);
},
- _settingsInitRegion: function(zoomRegion) {
- // Mag factor is accurate to two decimal places.
- let aPref = parseFloat(this._settings.get_double(MAG_FACTOR_KEY).toFixed(2));
- if (aPref != 0.0)
- zoomRegion.setMagFactor(aPref, aPref);
-
- aPref = this._settings.get_enum(SCREEN_POSITION_KEY);
- if (aPref)
- zoomRegion.setScreenPosition(aPref);
-
- zoomRegion.setLensMode(this._settings.get_boolean(LENS_MODE_KEY));
- zoomRegion.setClampScrollingAtEdges(!this._settings.get_boolean(CLAMP_MODE_KEY));
-
- aPref = this._settings.get_enum(MOUSE_TRACKING_KEY);
- if (aPref)
- zoomRegion.setMouseTrackingMode(aPref);
-
- aPref = this._settings.get_enum(FOCUS_TRACKING_KEY);
- if (aPref)
- zoomRegion.setFocusTrackingMode(aPref);
-
- aPref = this._settings.get_enum(CARET_TRACKING_KEY);
- if (aPref)
- zoomRegion.setCaretTrackingMode(aPref);
-
- aPref = this._settings.get_boolean(INVERT_LIGHTNESS_KEY);
- if (aPref)
- zoomRegion.setInvertLightness(aPref);
-
- aPref = this._settings.get_double(COLOR_SATURATION_KEY);
- if (aPref)
- zoomRegion.setColorSaturation(aPref);
-
- let bc = {};
- bc.r = this._settings.get_double(BRIGHT_RED_KEY);
- bc.g = this._settings.get_double(BRIGHT_GREEN_KEY);
- bc.b = this._settings.get_double(BRIGHT_BLUE_KEY);
- zoomRegion.setBrightness(bc);
-
- bc.r = this._settings.get_double(CONTRAST_RED_KEY);
- bc.g = this._settings.get_double(CONTRAST_GREEN_KEY);
- bc.b = this._settings.get_double(CONTRAST_BLUE_KEY);
- zoomRegion.setContrast(bc);
- },
-
- _settingsInit: function() {
+ _settingsInit: function(zoomRegion) {
this._appSettings = new Gio.Settings({ schema: APPLICATIONS_SCHEMA });
this._settings = new Gio.Settings({ schema: MAGNIFIER_SCHEMA });
- this._appSettings.connect('changed::' + SHOW_KEY, Lang.bind(this, function() {
- let active = this._appSettings.get_boolean(SHOW_KEY);
- this.setActive(active);
- }));
-
- return this._appSettings.get_boolean(SHOW_KEY);
- },
+ if (zoomRegion) {
+ // Mag factor is accurate to two decimal places.
+ let aPref = parseFloat(this._settings.get_double(MAG_FACTOR_KEY).toFixed(2));
+ if (aPref != 0.0)
+ zoomRegion.setMagFactor(aPref, aPref);
+
+ aPref = this._settings.get_enum(SCREEN_POSITION_KEY);
+ if (aPref)
+ zoomRegion.setScreenPosition(aPref);
+
+ zoomRegion.setLensMode(this._settings.get_boolean(LENS_MODE_KEY));
+ zoomRegion.setClampScrollingAtEdges(!this._settings.get_boolean(CLAMP_MODE_KEY));
+
+ aPref = this._settings.get_enum(MOUSE_TRACKING_KEY);
+ if (aPref)
+ zoomRegion.setMouseTrackingMode(aPref);
+
+ aPref = this._settings.get_enum(FOCUS_TRACKING_KEY);
+ if (aPref)
+ zoomRegion.setFocusTrackingMode(aPref);
+
+ aPref = this._settings.get_enum(CARET_TRACKING_KEY);
+ if (aPref)
+ zoomRegion.setCaretTrackingMode(aPref);
+
+ aPref = this._settings.get_boolean(INVERT_LIGHTNESS_KEY);
+ if (aPref)
+ zoomRegion.setInvertLightness(aPref);
+
+ aPref = this._settings.get_double(COLOR_SATURATION_KEY);
+ if (aPref)
+ zoomRegion.setColorSaturation(aPref);
+
+ let bc = {};
+ bc.r = this._settings.get_double(BRIGHT_RED_KEY);
+ bc.g = this._settings.get_double(BRIGHT_GREEN_KEY);
+ bc.b = this._settings.get_double(BRIGHT_BLUE_KEY);
+ zoomRegion.setBrightness(bc);
+
+ bc.r = this._settings.get_double(CONTRAST_RED_KEY);
+ bc.g = this._settings.get_double(CONTRAST_GREEN_KEY);
+ bc.b = this._settings.get_double(CONTRAST_BLUE_KEY);
+ zoomRegion.setContrast(bc);
+ }
- _settingsInitLate: function() {
let showCrosshairs = this._settings.get_boolean(SHOW_CROSS_HAIRS_KEY);
this.addCrosshairs();
this.setCrosshairsVisible(showCrosshairs);
+ this._appSettings.connect('changed::' + SHOW_KEY,
+ Lang.bind(this, function() {
+ this.setActive(this._appSettings.get_boolean(SHOW_KEY));
+ }));
+
this._settings.connect('changed::' + SCREEN_POSITION_KEY,
Lang.bind(this, this._updateScreenPosition));
this._settings.connect('changed::' + MAG_FACTOR_KEY,
@@ -577,6 +557,7 @@ const Magnifier = new Lang.Class({
Lang.bind(this, function() {
this.setCrosshairsClip(this._settings.get_boolean(CROSS_HAIRS_CLIP_KEY));
}));
+ return this._appSettings.get_boolean(SHOW_KEY);
},
_updateScreenPosition: function() {
--
1.8.3.2

44
gnome-base/gnome-shell/files/gnome-shell-3.10.4-restore-pref.patch
Unescape View File

@ -0,0 +1,44 @@
From 45041b421561ffac0bdfc92680a7a948d3623e65 Mon Sep 17 00:00:00 2001
From: Adel Gadllah <adel.gadllah@gmail.com>
Date: Fri, 21 Feb 2014 12:30:40 +0100
Subject: perf: Restore shell after runs
Currently running the perf tool results into no wm running
afterwards making it hard for the user to get the results from a terminal
and generally does not make it easy for users to run it to gather numbers.
So restore the shell after the test has completed.
https://bugzilla.gnome.org/show_bug.cgi?id=724870
diff --git a/src/gnome-shell-perf-tool.in b/src/gnome-shell-perf-tool.in
index 1ad67b8..4494a92 100644
--- a/src/gnome-shell-perf-tool.in
+++ b/src/gnome-shell-perf-tool.in
@@ -99,6 +99,15 @@ def run_shell(perf_output=None):
shell.wait()
return shell.returncode == 0
+def restore_shell():
+ pid = os.fork()
+ if (pid == 0):
+ if "MUTTER_WM_CLASS_FILTER" in os.environ:
+ del os.environ["MUTTER_WM_CLASS_FILTER"]
+ os.execlp("gnome-shell", "gnome-shell", "--replace")
+ else:
+ sys.exit(0)
+
def upload_performance_report(report_text):
try:
config_home = os.environ['XDG_CONFIG_HOME']
@@ -320,6 +329,6 @@ if args:
normal_exit = run_performance_test()
if normal_exit:
- sys.exit(0)
+ restore_shell()
else:
sys.exit(1)
--
cgit v0.10.1

28
gnome-base/gnome-shell/files/gnome-shell-3.10.4-scale-factor.patch
Unescape View File

@ -0,0 +1,28 @@
From a3d9946803326a5d1fc76c617733df82c7057434 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Sat, 22 Feb 2014 18:00:57 -0500
Subject: shell-global: Only set the scale factor if get_setting succeeded
If gdk_screen_get_setting fails, like if it's running without XSettings,
then the GValue will have a value of 0. A lot of code tries to divide by
the scale factor. This produces NaN, and combined with the fact that NaN
is "leaky", we very quickly end up spinning out of control.
diff --git a/src/shell-global.c b/src/shell-global.c
index 852d14f..7a9f6c7 100644
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -749,8 +749,8 @@ update_scale_factor (GdkScreen *screen, gpointer data)
GValue value = G_VALUE_INIT;
g_value_init (&value, G_TYPE_INT);
- gdk_screen_get_setting (global->gdk_screen, "gdk-window-scaling-factor", &value);
- g_object_set (context, "scale-factor", g_value_get_int (&value), NULL);
+ if (gdk_screen_get_setting (global->gdk_screen, "gdk-window-scaling-factor", &value))
+ g_object_set (context, "scale-factor", g_value_get_int (&value), NULL);
}
/* This is an IBus workaround. The flow of events with IBus is that every time
--
cgit v0.10.1

158
gnome-base/gnome-shell/files/gnome-shell-3.10.4-wired-network.patch
Unescape View File

@ -0,0 +1,158 @@
From 7051411be7bbfd9e0c2e831762c87872e5bde468 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Thu, 23 Jan 2014 14:25:06 -0500
Subject: network: Add a Wired device
This isn't quite like the design, as we don't show icons for other
devices when wired is in an error state.
https://bugzilla.gnome.org/show_bug.cgi?id=708966
diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index a3de3dd..3dc694e 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -21,6 +21,7 @@ const Util = imports.misc.util;
const NMConnectionCategory = {
INVALID: 'invalid',
+ WIRED: 'wired',
WIRELESS: 'wireless',
WWAN: 'wwan',
VPN: 'vpn'
@@ -296,6 +297,11 @@ const NMConnectionDevice = new Lang.Class({
this._activeConnectionChangedId = this._device.connect('notify::active-connection', Lang.bind(this, this._activeConnectionChanged));
},
+ _autoConnect: function() {
+ let connection = new NetworkManager.Connection();
+ this._client.add_and_activate_connection(connection, this._device, null, null);
+ },
+
destroy: function() {
if (this._stateChangedId) {
GObject.Object.prototype.disconnect.call(this._device, this._stateChangedId);
@@ -413,6 +419,48 @@ const NMConnectionDevice = new Lang.Class({
},
});
+const NMDeviceWired = new Lang.Class({
+ Name: 'NMDeviceWired',
+ Extends: NMConnectionDevice,
+ category: NMConnectionCategory.WIRED,
+
+ _init: function(client, device, settings) {
+ this.parent(client, device, settings);
+
+ this.item.menu.addMenuItem(createSettingsAction(_("Wired Settings"), device));
+ },
+
+ _isConnected: function() {
+ if (!this._device.active_connection)
+ return false;
+
+ let state = this._device.active_connection.state;
+ return state >= NetworkManager.ActiveConnectionState.ACTIVATING;
+ },
+
+ _sync: function() {
+ this.item.actor.visible = this._isConnected();
+ this.parent();
+ },
+
+ _getMenuIcon: function() {
+ if (this._device.active_connection)
+ return this.getIndicatorIcon();
+ else
+ return 'network-wired-disconnected-symbolic';
+ },
+
+ getIndicatorIcon: function() {
+ let state = this._device.active_connection.state;
+ if (state == NetworkManager.ActiveConnectionState.ACTIVATING)
+ return 'network-wired-acquiring-symbolic';
+ else if (state == NetworkManager.ActiveConnectionState.ACTIVATED)
+ return 'network-wired-symbolic';
+ else
+ return 'network-wired-disconnected-symbolic';
+ }
+});
+
const NMDeviceModem = new Lang.Class({
Name: 'NMDeviceModem',
Extends: NMConnectionDevice,
@@ -510,18 +558,6 @@ const NMDeviceBluetooth = new Lang.Class({
this.item.menu.addMenuItem(createSettingsAction(_("Mobile Broadband Settings"), device));
},
- _autoConnect: function() {
- // FIXME: DUN devices are configured like modems, so
- // We need to spawn the mobile wizard
- // but the network panel doesn't support bluetooth at the moment
- // so we just create an empty connection and hope
- // that this phone supports PAN
-
- let connection = new NetworkManager.Connection();
- this._client.add_and_activate_connection(connection, this._device, null, null);
- return true;
- },
-
_getMenuIcon: function() {
if (this._device.active_connection)
return this.getIndicatorIcon();
@@ -1266,6 +1302,7 @@ const NMApplet = new Lang.Class({
// Device types
this._dtypes = { };
+ this._dtypes[NetworkManager.DeviceType.ETHERNET] = NMDeviceWired;
this._dtypes[NetworkManager.DeviceType.WIFI] = NMDeviceWireless;
this._dtypes[NetworkManager.DeviceType.MODEM] = NMDeviceModem;
this._dtypes[NetworkManager.DeviceType.BT] = NMDeviceBluetooth;
@@ -1273,6 +1310,7 @@ const NMApplet = new Lang.Class({
// Connection types
this._ctypes = { };
+ this._ctypes[NetworkManager.SETTING_WIRED_SETTING_NAME] = NMConnectionCategory.WIRED;
this._ctypes[NetworkManager.SETTING_WIRELESS_SETTING_NAME] = NMConnectionCategory.WIRELESS;
this._ctypes[NetworkManager.SETTING_BLUETOOTH_SETTING_NAME] = NMConnectionCategory.WWAN;
this._ctypes[NetworkManager.SETTING_CDMA_SETTING_NAME] = NMConnectionCategory.WWAN;
@@ -1295,6 +1333,15 @@ const NMApplet = new Lang.Class({
this._tryLateInit();
},
+ _createDeviceCategory: function() {
+ let category = {
+ section: new PopupMenu.PopupMenuSection(),
+ devices: [ ],
+ };
+ this.menu.addMenuItem(category.section);
+ return category;
+ },
+
_tryLateInit: function() {
if (!this._client || !this._settings)
return;
@@ -1310,17 +1357,9 @@ const NMApplet = new Lang.Class({
this._nmDevices = [];
this._devices = { };
- this._devices.wireless = {
- section: new PopupMenu.PopupMenuSection(),
- devices: [ ],
- };
- this.menu.addMenuItem(this._devices.wireless.section);
-
- this._devices.wwan = {
- section: new PopupMenu.PopupMenuSection(),
- devices: [ ],
- };
- this.menu.addMenuItem(this._devices.wwan.section);
+ this._devices.wired = this._createDeviceCategory();
+ this._devices.wireless = this._createDeviceCategory();
+ this._devices.wwan = this._createDeviceCategory();
this._vpnSection = new NMVPNSection(this._client);
this._vpnSection.connect('activation-failed', Lang.bind(this, this._onActivationFailed));
--
cgit v0.10.1

222
gnome-base/gnome-shell/files/gnome-shell-3.6.0-networkmanager-flag.patch
Unescape View File

@ -1,222 +0,0 @@
From da0912a522f80a72db5b73504dc82941067880b2 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Thu, 22 Dec 2011 22:04:12 +0100
Subject: [PATCH] Make NM optional
[ Alexandre Rostovtsev <tetromino@gentoo.org> :
* use config.js (and AC_SUBST HAVE_NETWORKMANAGER appropriately);
* take care to not import ui.status.network if nm is disabled;
* do not try to reassign to const variables;
* no point really in fiddling with the list of installed js files;
* don't build shell-mobile-providers if nm is disabled;
* use "networkmanager" instead of "network_manager" because THE
BIKESHED SHOULD BE BLUE, also because the upstream package name is
NetworkManager, not Network_Manager. ]
---
configure.ac | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
js/Makefile.am | 1 +
js/misc/config.js.in | 2 ++
js/ui/panel.js | 12 +++++++-----
js/ui/sessionMode.js | 7 ++++++-
src/Makefile.am | 17 ++++++++++++-----
6 files changed, 74 insertions(+), 12 deletions(-)
diff --git a/configure.ac b/configure.ac
index e6ac88c..3ff8777 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,10 +96,43 @@ PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MIN_VERSION
telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION
polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
- libnm-glib libnm-util gnome-keyring-1
+ gnome-keyring-1
gcr-3 >= $GCR_MIN_VERSION
gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
+##########################
+# Check for NetworkManager
+##########################
+NM_MIN_VERSION=0.9
+AC_ARG_ENABLE(networkmanager,
+ AS_HELP_STRING([--disable-networkmanager],
+ [disable NetworkManager support @<:@default=auto@:>@]),,
+ [enable_networkmanager=auto])
+
+if test "x$enable_networkmanager" != "xno"; then
+ PKG_CHECK_MODULES(NETWORKMANAGER,
+ [libnm-glib libnm-util gnome-keyring-1],
+ [have_networkmanager=yes],
+ [have_networkmanager=no])
+
+ GNOME_SHELL_CFLAGS="$GNOME_SHELL_CFLAGS $NETWORKMANAGER_CFLAGS"
+ GNOME_SHELL_LIBS="$GNOME_SHELL_LIBS $NETWORKMANAGER_LIBS"
+else
+ have_networkmanager="no (disabled)"
+fi
+
+if test "x$have_networkmanager" = "xyes"; then
+ AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager])
+ AC_SUBST([HAVE_NETWORKMANAGER], [1])
+else
+ if test "x$enable_networkmanager" = "xyes"; then
+ AC_MSG_ERROR([Couldn't find NetworkManager.])
+ fi
+ AC_SUBST([HAVE_NETWORKMANAGER], [0])
+fi
+
+AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes")
+
PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0)
PKG_CHECK_MODULES(SHELL_HOTPLUG_SNIFFER, gio-2.0 gdk-pixbuf-2.0)
@@ -260,3 +293,15 @@ AC_CONFIG_FILES([
man/Makefile
])
AC_OUTPUT
+
+echo "
+Build configuration:
+
+ Prefix: ${prefix}
+ Source code location: ${srcdir}
+ Compiler: ${CC}
+ Compiler Warnings: $enable_compile_warnings
+
+ Support for NetworkManager: $have_networkmanager
+ Support for GStreamer recording: $build_recorder
+"
diff --git a/js/Makefile.am b/js/Makefile.am
index a3e4917..4b00193 100644
--- a/js/Makefile.am
+++ b/js/Makefile.am
@@ -8,6 +8,7 @@ misc/config.js: misc/config.js.in Makefile
sed -e "s|[@]PACKAGE_NAME@|$(PACKAGE_NAME)|g" \
-e "s|[@]PACKAGE_VERSION@|$(PACKAGE_VERSION)|g" \
-e "s|[@]HAVE_BLUETOOTH@|$(HAVE_BLUETOOTH)|g" \
+ -e "s|[@]HAVE_NETWORKMANAGER@|$(HAVE_NETWORKMANAGER)|g" \
-e "s|[@]GETTEXT_PACKAGE@|$(GETTEXT_PACKAGE)|g" \
-e "s|[@]datadir@|$(datadir)|g" \
-e "s|[@]libexecdir@|$(libexecdir)|g" \
diff --git a/js/misc/config.js.in b/js/misc/config.js.in
index 9769104..9c4795d 100644
--- a/js/misc/config.js.in
+++ b/js/misc/config.js.in
@@ -6,6 +6,8 @@ const PACKAGE_NAME = '@PACKAGE_NAME@';
const PACKAGE_VERSION = '@PACKAGE_VERSION@';
/* 1 if gnome-bluetooth is available, 0 otherwise */
const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
+/* 1 if networkmanager is available, 0 otherwise */
+const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@;
/* gettext package */
const GETTEXT_PACKAGE = '@GETTEXT_PACKAGE@';
/* locale dir */
diff --git a/js/ui/panel.js b/js/ui/panel.js
index bcbaafb..40c6ff9 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -910,11 +910,13 @@ if (Config.HAVE_BLUETOOTH)
PANEL_ITEM_IMPLEMENTATIONS['bluetooth'] =
imports.ui.status.bluetooth.Indicator;
-try {
- PANEL_ITEM_IMPLEMENTATIONS['network'] =
- imports.ui.status.network.NMApplet;
-} catch(e) {
- log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
+if (Config.HAVE_NETWORKMANAGER) {
+ try {
+ PANEL_ITEM_IMPLEMENTATIONS['network'] =
+ imports.ui.status.network.NMApplet;
+ } catch(e) {
+ log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
+ }
}
const Panel = new Lang.Class({
diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js
index 808109a..7ee6b1e 100644
--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
@@ -6,6 +6,8 @@ const Signals = imports.signals;
const Main = imports.ui.main;
const Params = imports.misc.params;
+const Config = imports.misc.config;
+
const DEFAULT_MODE = 'restrictive';
const _modes = {
@@ -91,7 +93,10 @@ const _modes = {
isLocked: false,
isPrimary: true,
unlockDialog: imports.ui.unlockDialog.UnlockDialog,
- components: ['networkAgent', 'polkitAgent', 'telepathyClient',
+ components: Config.HAVE_NETWORKMANAGER ?
+ ['networkAgent', 'polkitAgent', 'telepathyClient',
+ 'keyring', 'recorder', 'autorunManager', 'automountManager'] :
+ ['polkitAgent', 'telepathyClient',
'keyring', 'recorder', 'autorunManager', 'automountManager'],
panel: {
left: ['activities', 'appMenu'],
diff --git a/src/Makefile.am b/src/Makefile.am
index a390691..552b640 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -115,9 +115,7 @@ shell_public_headers_h = \
shell-global.h \
shell-idle-monitor.h \
shell-invert-lightness-effect.h \
- shell-mobile-providers.h \
shell-mount-operation.h \
- shell-network-agent.h \
shell-perf-log.h \
shell-screenshot.h \
shell-screen-grabber.h \
@@ -131,6 +129,10 @@ shell_public_headers_h = \
shell-wm.h \
shell-xfixes-cursor.h
+if HAVE_NETWORKMANAGER
+shell_public_headers_h += shell-mobile-providers.h shell-network-agent.h
+endif
+
shell_private_sources = \
gactionmuxer.h \
gactionmuxer.c \
@@ -162,9 +164,7 @@ libgnome_shell_la_SOURCES = \
shell-invert-lightness-effect.c \
shell-keyring-prompt.h \
shell-keyring-prompt.c \
- shell-mobile-providers.c \
shell-mount-operation.c \
- shell-network-agent.c \
shell-perf-log.c \
shell-polkit-authentication-agent.h \
shell-polkit-authentication-agent.c \
@@ -183,6 +183,10 @@ libgnome_shell_la_SOURCES = \
shell-xfixes-cursor.c \
$(NULL)
+if HAVE_NETWORKMANAGER
+libgnome_shell_la_SOURCES += shell-mobile-providers.c shell-network-agent.c
+endif
+
libgnome_shell_la_gir_sources = \
$(filter-out %-private.h $(shell_private_sources), $(shell_public_headers_h) $(libgnome_shell_la_SOURCES))
@@ -296,7 +300,10 @@ libgnome_shell_la_LIBADD = \
libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)
Shell-0.1.gir: libgnome-shell.la St-1.0.gir
-Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0
+Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0
+if HAVE_NETWORKMANAGER
+Shell_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0
+endif
Shell_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir)
Shell_0_1_gir_LIBS = libgnome-shell.la
Shell_0_1_gir_FILES = $(libgnome_shell_la_gir_sources)
--
1.7.12

45
gnome-base/gnome-shell/files/gnome-shell-3.7.90-bluetooth-flag.patch
Unescape View File

@ -1,45 +0,0 @@
From 0556d99379265b5ccd256bc6befcd1486fe4e464 Mon Sep 17 00:00:00 2001
From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
Date: Thu, 28 Feb 2013 18:48:32 +0330
Subject: [PATCH] gnome-shell-3.7.90--bluetooth-flag
https://bugs.gentoo.org/show_bug.cgi?id=398145
Ed Catmur 2012-01-08 13:46:22 UTC
libgnome-bluetooth-applet is a private library so they shouldn't be linking
against it anyway. I tried to work out how to tell libtool to add it to rpath
but got totally lost.
I'll see if I can work out how to fix the automagic gnome-bluetooth dependency
so I can at least merge USE=-bluetooth.
---
configure.ac | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/configure.ac b/configure.ac
index d9d1001..02f1e65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,6 +111,8 @@ PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.7.4)
PKG_CHECK_MODULES(CARIBOU, caribou-1.0 >= 0.4.8)
AC_MSG_CHECKING([for bluetooth support])
+AC_ARG_WITH([bluetooth], AS_HELP_STRING([--without-bluetooth], [Build without gnome-bluetooth library (default: auto)]))
+AS_IF([test "x$with_bluetooth" != "xno"], [
PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
[BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0`
BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0`
@@ -123,6 +125,9 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
[AC_DEFINE([HAVE_BLUETOOTH],[0])
AC_SUBST([HAVE_BLUETOOTH],[0])
AC_MSG_RESULT([no])])
+], [AC_DEFINE([HAVE_BLUETOOTH],[0])
+ AC_SUBST([HAVE_BLUETOOTH],[0])
+ AC_MSG_RESULT([no])])
PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION gio-2.0)
AC_SUBST(CALENDAR_SERVER_CFLAGS)
--
1.8.1.2

200
gnome-base/gnome-shell/files/gnome-shell-3.8.0-networkmanager-flag-r1.patch
Unescape View File

@ -1,200 +0,0 @@
* use config.js (and AC_SUBST HAVE_NETWORKMANAGER appropriately);
* take care to not import ui.status.network if nm is disabled;
* do not try to reassign to const variables;
* no point really in fiddling with the list of installed js files;
* don't build shell-mobile-providers if nm is disabled;
* use "networkmanager" instead of "network_manager" because THE
BIKESHED SHOULD BE BLUE, also because the upstream package name is
NetworkManager, not Network_Manager.
--- a/configure.ac 2013-03-27 17:28:24.000000000 +0100
+++ b/configure.ac 2013-04-02 18:47:05.569818375 +0200
@@ -94,8 +94,6 @@
libcanberra libcanberra-gtk3
telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
- libnm-glib libnm-util >= $NETWORKMANAGER_MIN_VERSION
- libnm-gtk >= $NETWORKMANAGER_MIN_VERSION
libsecret-unstable gcr-3 >= $GCR_MIN_VERSION)
PKG_CHECK_MODULES(GNOME_SHELL_JS, gio-2.0 gjs-internals-1.0 >= $GJS_MIN_VERSION)
@@ -154,6 +157,38 @@
[Define if _NL_TIME_FIRST_WEEKDAY is available])
fi
+AC_ARG_ENABLE(networkmanager,
+ AS_HELP_STRING([--disable-networkmanager],
+ [disable NetworkManager support @<:@default=auto@:>@]),,
+ [enable_networkmanager=auto])
+
+if test "x$enable_networkmanager" != "xno"; then
+ PKG_CHECK_MODULES(NETWORKMANAGER,
+ [libnm-glib
+ libnm-util >= $NETWORKMANAGER_MIN_VERSION
+ libnm-gtk >= $NETWORKMANAGER_MIN_VERSION
+ gnome-keyring-1],
+ [have_networkmanager=yes],
+ [have_networkmanager=no])
+
+ GNOME_SHELL_CFLAGS="$GNOME_SHELL_CFLAGS $NETWORKMANAGER_CFLAGS"
+ GNOME_SHELL_LIBS="$GNOME_SHELL_LIBS $NETWORKMANAGER_LIBS"
+else
+ have_networkmanager="no (disabled)"
+fi
+
+if test "x$have_networkmanager" = "xyes"; then
+ AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager])
+ AC_SUBST([HAVE_NETWORKMANAGER], [1])
+else
+ if test "x$enable_networkmanager" = "xyes"; then
+ AC_MSG_ERROR([Couldn't find NetworkManager.])
+ fi
+ AC_SUBST([HAVE_NETWORKMANAGER], [0])
+fi
+
+AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes")
+
# Sets GLIB_GENMARSHAL and GLIB_MKENUMS
AM_PATH_GLIB_2_0()
@@ -199,3 +234,15 @@
man/Makefile
])
AC_OUTPUT
+
+echo "
+Build configuration:
+
+ Prefix: ${prefix}
+ Source code location: ${srcdir}
+ Compiler: ${CC}
+ Compiler Warnings: $enable_compile_warnings
+
+ Support for NetworkManager: $have_networkmanager
+ Support for GStreamer recording: $build_recorder
+"
diff --git a/js/Makefile.am b/js/Makefile.am
index 323cd1b..d17111a 100644
--- a/js/Makefile.am
+++ b/js/Makefile.am
@@ -8,6 +8,7 @@ misc/config.js: misc/config.js.in Makefile
sed -e "s|[@]PACKAGE_NAME@|$(PACKAGE_NAME)|g" \
-e "s|[@]PACKAGE_VERSION@|$(PACKAGE_VERSION)|g" \
-e "s|[@]HAVE_BLUETOOTH@|$(HAVE_BLUETOOTH)|g" \
+ -e "s|[@]HAVE_NETWORKMANAGER@|$(HAVE_NETWORKMANAGER)|g" \
-e "s|[@]GETTEXT_PACKAGE@|$(GETTEXT_PACKAGE)|g" \
-e "s|[@]datadir@|$(datadir)|g" \
-e "s|[@]libexecdir@|$(libexecdir)|g" \
diff --git a/js/misc/config.js.in b/js/misc/config.js.in
index 9769104..9c4795d 100644
--- a/js/misc/config.js.in
+++ b/js/misc/config.js.in
@@ -6,6 +6,8 @@ const PACKAGE_NAME = '@PACKAGE_NAME@';
const PACKAGE_VERSION = '@PACKAGE_VERSION@';
/* 1 if gnome-bluetooth is available, 0 otherwise */
const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
+/* 1 if networkmanager is available, 0 otherwise */
+const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@;
/* gettext package */
const GETTEXT_PACKAGE = '@GETTEXT_PACKAGE@';
/* locale dir */
diff --git a/js/ui/panel.js b/js/ui/panel.js
index cfeb351..3bb13b4 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -933,11 +933,13 @@ if (Config.HAVE_BLUETOOTH)
PANEL_ITEM_IMPLEMENTATIONS['bluetooth'] =
imports.ui.status.bluetooth.Indicator;
-try {
- PANEL_ITEM_IMPLEMENTATIONS['network'] =
- imports.ui.status.network.NMApplet;
-} catch(e) {
- log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
+if (Config.HAVE_NETWORKMANAGER) {
+ try {
+ PANEL_ITEM_IMPLEMENTATIONS['network'] =
+ imports.ui.status.network.NMApplet;
+ } catch(e) {
+ log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
+ }
}
const Panel = new Lang.Class({
diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js
index f802dbd..eec830b 100644
--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
@@ -10,6 +10,8 @@ const FileUtils = imports.misc.fileUtils;
const Main = imports.ui.main;
const Params = imports.misc.params;
+const Config = imports.misc.config;
+
const DEFAULT_MODE = 'restrictive';
const _modes = {
@@ -100,7 +102,10 @@ const _modes = {
isLocked: false,
isPrimary: true,
unlockDialog: imports.ui.unlockDialog.UnlockDialog,
- components: ['networkAgent', 'polkitAgent', 'telepathyClient',
+ components: Config.HAVE_NETWORKMANAGER ?
+ ['networkAgent', 'polkitAgent', 'telepathyClient',
+ 'keyring', 'recorder', 'autorunManager', 'automountManager'] :
+ ['polkitAgent', 'telepathyClient',
'keyring', 'recorder', 'autorunManager', 'automountManager'],
panel: {
left: ['activities', 'appMenu'],
--- a/src/Makefile.am.old 2013-03-27 10:35:51.763616888 +0100
+++ b/src/Makefile.am 2013-03-27 10:38:09.745425152 +0100
@@ -116,7 +116,6 @@
shell-invert-lightness-effect.h \
shell-keybinding-modes.h \
shell-mount-operation.h \
- shell-network-agent.h \
shell-perf-log.h \
shell-screenshot.h \
shell-slicer.h \
@@ -129,6 +128,10 @@
shell-wm.h \
shell-xfixes-cursor.h
+if HAVE_NETWORKMANAGER
+shell_public_headers_h += shell-network-agent.h
+endif
+
shell_private_sources = \
gactionmuxer.h \
gactionmuxer.c \
@@ -159,7 +162,6 @@
shell-keyring-prompt.h \
shell-keyring-prompt.c \
shell-mount-operation.c \
- shell-network-agent.c \
shell-perf-log.c \
shell-polkit-authentication-agent.h \
shell-polkit-authentication-agent.c \
@@ -177,6 +179,10 @@
shell-xfixes-cursor.c \
$(NULL)
+if HAVE_NETWORKMANAGER
+libgnome_shell_la_SOURCES += shell-network-agent.c
+endif
+
libgnome_shell_la_gir_sources = \
$(filter-out %-private.h $(shell_private_sources), $(shell_public_headers_h) $(libgnome_shell_la_SOURCES))
@@ -287,7 +293,10 @@
libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)
Shell-0.1.gir: libgnome-shell.la St-1.0.gir
-Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0
+Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 Soup-2.4 GMenu-3.0
+if HAVE_NETWORKMANAGER
+Shell_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0
+endif
Shell_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir)
Shell_0_1_gir_LIBS = libgnome-shell.la
Shell_0_1_gir_FILES = $(libgnome_shell_la_gir_sources)

200
gnome-base/gnome-shell/files/gnome-shell-3.8.3-networkmanager-flag.patch
Unescape View File

@ -1,200 +0,0 @@
* use config.js (and AC_SUBST HAVE_NETWORKMANAGER appropriately);
* take care to not import ui.status.network if nm is disabled;
* do not try to reassign to const variables;
* no point really in fiddling with the list of installed js files;
* don't build shell-mobile-providers if nm is disabled;
* use "networkmanager" instead of "network_manager" because THE
BIKESHED SHOULD BE BLUE, also because the upstream package name is
NetworkManager, not Network_Manager.
--- a/configure.ac 2013-03-27 17:28:24.000000000 +0100
+++ b/configure.ac 2013-04-02 18:47:05.569818375 +0200
@@ -94,8 +94,6 @@
libcanberra libcanberra-gtk3
telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
- libnm-glib libnm-util >= $NETWORKMANAGER_MIN_VERSION
- libnm-gtk >= $NETWORKMANAGER_MIN_VERSION
libsecret-unstable gcr-base-3 >= $GCR_MIN_VERSION)
PKG_CHECK_MODULES(GNOME_SHELL_JS, gio-2.0 gjs-internals-1.0 >= $GJS_MIN_VERSION)
@@ -154,6 +157,38 @@
[Define if _NL_TIME_FIRST_WEEKDAY is available])
fi
+AC_ARG_ENABLE(networkmanager,
+ AS_HELP_STRING([--disable-networkmanager],
+ [disable NetworkManager support @<:@default=auto@:>@]),,
+ [enable_networkmanager=auto])
+
+if test "x$enable_networkmanager" != "xno"; then
+ PKG_CHECK_MODULES(NETWORKMANAGER,
+ [libnm-glib
+ libnm-util >= $NETWORKMANAGER_MIN_VERSION
+ libnm-gtk >= $NETWORKMANAGER_MIN_VERSION
+ gnome-keyring-1],
+ [have_networkmanager=yes],
+ [have_networkmanager=no])
+
+ GNOME_SHELL_CFLAGS="$GNOME_SHELL_CFLAGS $NETWORKMANAGER_CFLAGS"
+ GNOME_SHELL_LIBS="$GNOME_SHELL_LIBS $NETWORKMANAGER_LIBS"
+else
+ have_networkmanager="no (disabled)"
+fi
+
+if test "x$have_networkmanager" = "xyes"; then
+ AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager])
+ AC_SUBST([HAVE_NETWORKMANAGER], [1])
+else
+ if test "x$enable_networkmanager" = "xyes"; then
+ AC_MSG_ERROR([Couldn't find NetworkManager.])
+ fi
+ AC_SUBST([HAVE_NETWORKMANAGER], [0])
+fi
+
+AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes")
+
# Sets GLIB_GENMARSHAL and GLIB_MKENUMS
AM_PATH_GLIB_2_0()
@@ -199,3 +234,15 @@
man/Makefile
])
AC_OUTPUT
+
+echo "
+Build configuration:
+
+ Prefix: ${prefix}
+ Source code location: ${srcdir}
+ Compiler: ${CC}
+ Compiler Warnings: $enable_compile_warnings
+
+ Support for NetworkManager: $have_networkmanager
+ Support for GStreamer recording: $build_recorder
+"
diff --git a/js/Makefile.am b/js/Makefile.am
index 323cd1b..d17111a 100644
--- a/js/Makefile.am
+++ b/js/Makefile.am
@@ -8,6 +8,7 @@ misc/config.js: misc/config.js.in Makefile
sed -e "s|[@]PACKAGE_NAME@|$(PACKAGE_NAME)|g" \
-e "s|[@]PACKAGE_VERSION@|$(PACKAGE_VERSION)|g" \
-e "s|[@]HAVE_BLUETOOTH@|$(HAVE_BLUETOOTH)|g" \
+ -e "s|[@]HAVE_NETWORKMANAGER@|$(HAVE_NETWORKMANAGER)|g" \
-e "s|[@]GETTEXT_PACKAGE@|$(GETTEXT_PACKAGE)|g" \
-e "s|[@]datadir@|$(datadir)|g" \
-e "s|[@]libexecdir@|$(libexecdir)|g" \
diff --git a/js/misc/config.js.in b/js/misc/config.js.in
index 9769104..9c4795d 100644
--- a/js/misc/config.js.in
+++ b/js/misc/config.js.in
@@ -6,6 +6,8 @@ const PACKAGE_NAME = '@PACKAGE_NAME@';
const PACKAGE_VERSION = '@PACKAGE_VERSION@';
/* 1 if gnome-bluetooth is available, 0 otherwise */
const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
+/* 1 if networkmanager is available, 0 otherwise */
+const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@;
/* gettext package */
const GETTEXT_PACKAGE = '@GETTEXT_PACKAGE@';
/* locale dir */
diff --git a/js/ui/panel.js b/js/ui/panel.js
index cfeb351..3bb13b4 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -933,11 +933,13 @@ if (Config.HAVE_BLUETOOTH)
PANEL_ITEM_IMPLEMENTATIONS['bluetooth'] =
imports.ui.status.bluetooth.Indicator;
-try {
- PANEL_ITEM_IMPLEMENTATIONS['network'] =
- imports.ui.status.network.NMApplet;
-} catch(e) {
- log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
+if (Config.HAVE_NETWORKMANAGER) {
+ try {
+ PANEL_ITEM_IMPLEMENTATIONS['network'] =
+ imports.ui.status.network.NMApplet;
+ } catch(e) {
+ log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
+ }
}
const Panel = new Lang.Class({
diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js
index f802dbd..eec830b 100644
--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
@@ -10,6 +10,8 @@ const FileUtils = imports.misc.fileUtils;
const Main = imports.ui.main;
const Params = imports.misc.params;
+const Config = imports.misc.config;
+
const DEFAULT_MODE = 'restrictive';
const _modes = {
@@ -100,7 +102,10 @@ const _modes = {
isLocked: false,
isPrimary: true,
unlockDialog: imports.ui.unlockDialog.UnlockDialog,
- components: ['networkAgent', 'polkitAgent', 'telepathyClient',
+ components: Config.HAVE_NETWORKMANAGER ?
+ ['networkAgent', 'polkitAgent', 'telepathyClient',
+ 'keyring', 'recorder', 'autorunManager', 'automountManager'] :
+ ['polkitAgent', 'telepathyClient',
'keyring', 'recorder', 'autorunManager', 'automountManager'],
panel: {
left: ['activities', 'appMenu'],
--- a/src/Makefile.am.old 2013-03-27 10:35:51.763616888 +0100
+++ b/src/Makefile.am 2013-03-27 10:38:09.745425152 +0100
@@ -116,7 +116,6 @@
shell-invert-lightness-effect.h \
shell-keybinding-modes.h \
shell-mount-operation.h \
- shell-network-agent.h \
shell-perf-log.h \
shell-screenshot.h \
shell-slicer.h \
@@ -129,6 +128,10 @@
shell-wm.h \
shell-xfixes-cursor.h
+if HAVE_NETWORKMANAGER
+shell_public_headers_h += shell-network-agent.h
+endif
+
shell_private_sources = \
gactionmuxer.h \
gactionmuxer.c \
@@ -159,7 +162,6 @@
shell-keyring-prompt.h \
shell-keyring-prompt.c \
shell-mount-operation.c \
- shell-network-agent.c \
shell-perf-log.c \
shell-polkit-authentication-agent.h \
shell-polkit-authentication-agent.c \
@@ -177,6 +179,10 @@
shell-xfixes-cursor.c \
$(NULL)
+if HAVE_NETWORKMANAGER
+libgnome_shell_la_SOURCES += shell-network-agent.c
+endif
+
libgnome_shell_la_gir_sources = \
$(filter-out %-private.h $(shell_private_sources), $(shell_public_headers_h) $(libgnome_shell_la_SOURCES))
@@ -287,7 +293,10 @@
libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)
Shell-0.1.gir: libgnome-shell.la St-1.0.gir
-Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0
+Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 Soup-2.4 GMenu-3.0
+if HAVE_NETWORKMANAGER
+Shell_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0
+endif
Shell_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir)
Shell_0_1_gir_LIBS = libgnome-shell.la
Shell_0_1_gir_FILES = $(libgnome_shell_la_gir_sources)

226
gnome-base/gnome-shell/files/gnome-shell-3.8.3-relock-screen.patch
Unescape View File

@ -1,226 +0,0 @@
From ccfa3d3be15b3a52bfcc37feee3abb2f2d4f66cb Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 17 Jan 2013 19:39:54 +0000
Subject: Re-lock the screen if we're restarted from a previously crashed shell
This way we "fail closed", which is better for security.
See https://bugs.launchpad.net/ubuntu/+source/gdm/+bug/1064584
https://bugzilla.gnome.org/show_bug.cgi?id=691987
---
diff --git a/js/ui/main.js b/js/ui/main.js
index 2657678..2dc421b 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -195,6 +195,9 @@ function _initializeUI() {
if (keybindingMode == Shell.KeyBindingMode.NONE) {
keybindingMode = Shell.KeyBindingMode.NORMAL;
}
+ if (screenShield) {
+ screenShield.lockIfWasLocked();
+ }
});
}
diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 48cfaa6..185f109 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -30,6 +30,7 @@ const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver';
const LOCK_ENABLED_KEY = 'lock-enabled';
const LOCK_DELAY_KEY = 'lock-delay';
+const LOCKED_STATE_STR = 'screenShield.locked';
// fraction of screen height the arrow must reach before completing
// the slide up automatically
const ARROW_DRAG_THRESHOLD = 0.1;
@@ -1175,6 +1176,7 @@ const ScreenShield = new Lang.Class({
this._isLocked = false;
this.emit('active-changed');
this.emit('locked-changed');
+ global.set_runtime_state(LOCKED_STATE_STR, null);
},
activate: function(animate) {
@@ -1191,6 +1193,7 @@ const ScreenShield = new Lang.Class({
}
this._resetLockScreen(animate, animate);
+ global.set_runtime_state(LOCKED_STATE_STR, GLib.Variant.new('b', true));
// We used to set isActive and emit active-changed here,
// but now we do that from lockScreenShown, which means
@@ -1217,5 +1220,15 @@ const ScreenShield = new Lang.Class({
this.emit('locked-changed');
},
+
+ // If the previous shell crashed, and gnome-session restarted us, then re-lock
+ lockIfWasLocked: function() {
+ let wasLocked = global.get_runtime_state('b', LOCKED_STATE_STR);
+ if (wasLocked === null)
+ return;
+ Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() {
+ this.lock(false);
+ }));
+ }
});
Signals.addSignalMethods(ScreenShield.prototype);
diff --git a/src/shell-global.c b/src/shell-global.c
index 9a594b7..2f96048 100644
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -82,6 +82,8 @@ struct _ShellGlobal {
const char *userdatadir;
StFocusManager *focus_manager;
+ GFile *runtime_state_path;
+
guint work_count;
GSList *leisure_closures;
guint leisure_function_id;
@@ -232,6 +234,8 @@ shell_global_init (ShellGlobal *global)
const char *datadir = g_getenv ("GNOME_SHELL_DATADIR");
const char *shell_js = g_getenv("GNOME_SHELL_JS");
char *imagedir, **search_path;
+ char *path;
+ const char *byteorder_string;
if (!datadir)
datadir = GNOME_SHELL_DATADIR;
@@ -254,6 +258,20 @@ shell_global_init (ShellGlobal *global)
global->userdatadir = g_build_filename (g_get_user_data_dir (), "gnome-shell", NULL);
g_mkdir_with_parents (global->userdatadir, 0700);
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+ byteorder_string = "LE";
+#else
+ byteorder_string = "BE";
+#endif
+
+ /* And the runtime state */
+ path = g_strdup_printf ("%s/gnome-shell/runtime-state-%s.%s",
+ g_get_user_runtime_dir (),
+ byteorder_string,
+ XDisplayName (NULL));
+ (void) g_mkdir_with_parents (path, 0700);
+ global->runtime_state_path = g_file_new_for_path (path);
+
global->settings = g_settings_new ("org.gnome.shell");
global->grab_notifier = GTK_WINDOW (gtk_window_new (GTK_WINDOW_TOPLEVEL));
@@ -295,6 +313,8 @@ shell_global_finalize (GObject *object)
the_object = NULL;
+ g_clear_object (&global->runtime_state_path);
+
G_OBJECT_CLASS(shell_global_parent_class)->finalize (object);
}
@@ -1764,3 +1784,83 @@ shell_global_get_session_mode (ShellGlobal *global)
return global->session_mode;
}
+
+static GFile *
+get_runtime_state_path (ShellGlobal *global,
+ const char *property_name)
+{
+ return g_file_get_child (global->runtime_state_path, property_name);
+}
+
+/**
+ * shell_global_set_runtime_state:
+ * @global: a #ShellGlobal
+ * @property_name: Name of the property
+ * @variant: (allow-none): A #GVariant, or %NULL to unset
+ *
+ * Change the value of serialized runtime state.
+ */
+void
+shell_global_set_runtime_state (ShellGlobal *global,
+ const char *property_name,
+ GVariant *variant)
+{
+ GFile *path;
+
+ path = get_runtime_state_path (global, property_name);
+
+ if (variant == NULL)
+ (void) g_file_delete (path, NULL, NULL);
+ else
+ {
+ gsize size = g_variant_get_size (variant);
+ g_file_replace_contents (path, g_variant_get_data (variant), size,
+ NULL, FALSE, G_FILE_CREATE_REPLACE_DESTINATION,
+ NULL, NULL, NULL);
+ }
+}
+
+/**
+ * shell_global_get_runtime_state:
+ * @global: a #ShellGlobal
+ * @property_type: Expected data type
+ * @property_name: Name of the property
+ *
+ * The shell maintains "runtime" state which does not persist across
+ * logout or reboot.
+ *
+ * Returns: The value of a serialized property, or %NULL if none stored
+ */
+GVariant *
+shell_global_get_runtime_state (ShellGlobal *global,
+ const char *property_type,
+ const char *property_name)
+{
+ GVariant *res = NULL;
+ GMappedFile *mfile;
+ GFile *path;
+ char *pathstr;
+ GError *local_error = NULL;
+
+ path = get_runtime_state_path (global, property_name);
+ pathstr = g_file_get_path (path);
+ mfile = g_mapped_file_new (pathstr, FALSE, &local_error);
+ if (!mfile)
+ {
+ if (!g_error_matches (local_error, G_FILE_ERROR, G_FILE_ERROR_NOENT))
+ {
+ g_warning ("Failed to open runtime state: %s", local_error->message);
+ }
+ g_clear_error (&local_error);
+ }
+ else
+ {
+ GBytes *bytes = g_mapped_file_get_bytes (mfile);
+ res = g_variant_new_from_bytes ((GVariantType*)property_type, bytes, TRUE);
+ g_bytes_unref (bytes);
+ g_mapped_file_unref (mfile);
+ }
+
+ out:
+ return res;
+}
diff --git a/src/shell-global.h b/src/shell-global.h
index 69dff85..38532b5 100644
--- a/src/shell-global.h
+++ b/src/shell-global.h
@@ -149,6 +149,14 @@ void shell_global_reexec_self (ShellGlobal *global);
const char * shell_global_get_session_mode (ShellGlobal *global);
+void shell_global_set_runtime_state (ShellGlobal *global,
+ const char *property_name,
+ GVariant *variant);
+GVariant * shell_global_get_runtime_state (ShellGlobal *global,
+ const char *property_type,
+ const char *property_name);
+
+
G_END_DECLS
#endif /* __SHELL_GLOBAL_H__ */
--
cgit v0.9.2

94
gnome-base/gnome-shell/files/gnome-shell-3.8.4-allocate-scrollbars.patch
Unescape View File

@ -1,94 +0,0 @@
From 52417a8363cdb5b57af744cd4ca311c7f068403e Mon Sep 17 00:00:00 2001
From: Adel Gadllah <adel.gadllah@gmail.com>
Date: Sat, 10 Aug 2013 20:09:33 +0000
Subject: st-scroll-view: Unconditionally allocate scrollbars
Commit cfecd063c9ca3d18cd changed the allocation logic to not allocate
scrollbars when the *_visible booleans are false. This breaks the
fade effect as well as the NEVER policy. We do not paint scrollbars
when they are not supposed to be visible, so not allocating them
and thus leaving them in a "needs allocation" state just causes problems.
I am not convinced that it solved any problem to begin with (we don't paint
them anyway).
As the previous condition has basically always been true, just do it
unconditionally.
https://bugzilla.gnome.org/show_bug.cgi?id=705664
---
diff --git a/src/st/st-scroll-view.c b/src/st/st-scroll-view.c
index 04e263f..f59ae93 100644
--- a/src/st/st-scroll-view.c
+++ b/src/st/st-scroll-view.c
@@ -598,42 +598,36 @@ st_scroll_view_allocate (ClutterActor *actor,
*/
/* Vertical scrollbar */
- if (vscrollbar_visible)
- {
- if (clutter_actor_get_text_direction (actor) == CLUTTER_TEXT_DIRECTION_RTL)
- {
- child_box.x1 = content_box.x1;
- child_box.x2 = content_box.x1 + sb_width;
- }
- else
- {
- child_box.x1 = content_box.x2 - sb_width;
- child_box.x2 = content_box.x2;
- }
- child_box.y1 = content_box.y1;
- child_box.y2 = content_box.y2 - (hscrollbar_visible ? sb_height : 0);
+ if (clutter_actor_get_text_direction (actor) == CLUTTER_TEXT_DIRECTION_RTL)
+ {
+ child_box.x1 = content_box.x1;
+ child_box.x2 = content_box.x1 + sb_width;
+ }
+ else
+ {
+ child_box.x1 = content_box.x2 - sb_width;
+ child_box.x2 = content_box.x2;
+ }
+ child_box.y1 = content_box.y1;
+ child_box.y2 = content_box.y2 - (hscrollbar_visible ? sb_height : 0);
- clutter_actor_allocate (priv->vscroll, &child_box, flags);
- }
+ clutter_actor_allocate (priv->vscroll, &child_box, flags);
/* Horizontal scrollbar */
- if (hscrollbar_visible)
- {
- if (clutter_actor_get_text_direction (actor) == CLUTTER_TEXT_DIRECTION_RTL)
- {
- child_box.x1 = content_box.x1 + (vscrollbar_visible ? sb_width : 0);
- child_box.x2 = content_box.x2;
- }
- else
- {
- child_box.x1 = content_box.x1;
- child_box.x2 = content_box.x2 - (vscrollbar_visible ? sb_width : 0);
- }
- child_box.y1 = content_box.y2 - sb_height;
- child_box.y2 = content_box.y2;
+ if (clutter_actor_get_text_direction (actor) == CLUTTER_TEXT_DIRECTION_RTL)
+ {
+ child_box.x1 = content_box.x1 + (vscrollbar_visible ? sb_width : 0);
+ child_box.x2 = content_box.x2;
+ }
+ else
+ {
+ child_box.x1 = content_box.x1;
+ child_box.x2 = content_box.x2 - (vscrollbar_visible ? sb_width : 0);
+ }
+ child_box.y1 = content_box.y2 - sb_height;
+ child_box.y2 = content_box.y2;
- clutter_actor_allocate (priv->hscroll, &child_box, flags);
- }
+ clutter_actor_allocate (priv->hscroll, &child_box, flags);
/* In case the scrollbar policy is NEVER or scrollbars should be
* overlayed, we don't trim the content box allocation by the
--
cgit v0.9.2

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

Write Preview
Loading…
Cancel
Save