Sync with portage [Fri Feb 14 18:20:52 MSK 2014].

mhiretskiy
root 10 years ago
parent 6a5b93ef28
commit 7a4b5da91b

@ -0,0 +1,50 @@
From a85193f122b7ec0d377e0a39ac58c64f12c51085 Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos@gmail.com>
Date: Mon, 6 Jan 2014 13:45:00 +0000
Subject: [PATCH] auserver.c: Only write audio data to a file in debug builds
This isn't useful in regular builds and is actually a security
concern.
---
src/audio/auserver.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/audio/auserver.c b/src/audio/auserver.c
index 29716d3..3e838d0 100644
--- a/src/audio/auserver.c
+++ b/src/audio/auserver.c
@@ -58,9 +58,11 @@ static int play_wave_from_socket(snd_header *header,int audiostream)
int q,i,n,r;
unsigned char bytes[CST_AUDIOBUFFSIZE];
short shorts[CST_AUDIOBUFFSIZE];
+#ifdef DEBUG
cst_file fff;
fff = cst_fopen("/tmp/awb.wav",CST_OPEN_WRITE|CST_OPEN_BINARY);
+#endif
if ((audio_device = audio_open(header->sample_rate,1,
(header->encoding == CST_SND_SHORT) ?
@@ -107,7 +109,9 @@ static int play_wave_from_socket(snd_header *header,int audiostream)
for (q=r; q > 0; q-=n)
{
n = audio_write(audio_device,shorts,q);
+#ifdef DEBUG
cst_fwrite(fff,shorts,2,q);
+#endif
if (n <= 0)
{
audio_close(audio_device);
@@ -116,7 +120,9 @@ static int play_wave_from_socket(snd_header *header,int audiostream)
}
}
audio_close(audio_device);
+#ifdef DEBUG
cst_fclose(fff);
+#endif
return CST_OK_FORMAT;
--
1.8.3.1

@ -0,0 +1,29 @@
diff -Naur flite-1.3-release/main/Makefile flite-1.3-release.new/main/Makefile
--- flite-1.3-release/main/Makefile 2014-02-12 12:08:32.222776141 -0800
+++ flite-1.3-release.new/main/Makefile 2014-02-12 12:29:32.308048276 -0800
@@ -48,15 +48,23 @@
ALL = $(BINDIR)/flite$(EXEEXT) $(BINDIR)/flite_time$(EXEEXT) \
$(BINDIR)/t2p$(EXEEXT)
+include $(TOP)/config/common_make_rules
+
flite_LIBS = flite_$(FL_VOX) flite_$(FL_LANG) flite_$(FL_LEX)
flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%)
+ifdef SHFLAGS
flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.so)
+else
+flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a)
+endif
flite_time_LIBS = flite_cmu_time_awb flite_$(FL_LANG) flite_$(FL_LEX)
flite_time_LIBS_flags = -L$(LIBDIR) $(flite_time_LIBS:%=-l%)
+ifdef SHFLAGS
flite_time_LIBS_deps = $(flite_time_LIBS:%=$(LIBDIR)/lib%.so)
-
-include $(TOP)/config/common_make_rules
+else
+flite_time_LIBS_deps = $(flite_time_LIBS:%=$(LIBDIR)/lib%.a)
+endif
$(BINDIR)/flite$(EXEEXT): flite_main.o $(FLITELIBS) $(flite_LIBS_deps)
$(CC) $(CFLAGS) -o $@ flite_main.o $(flite_LIBS_flags) $(LDFLAGS)

@ -0,0 +1,11 @@
--- flite-1.3-release/config/common_make_rules 2013-04-03 15:28:04.004893371 +0100
+++ flite-1.3-release/config/common_make_rules 2013-04-03 15:27:50.574992901 +0100
@@ -69,7 +69,7 @@
ifdef SHFLAGS
FLITELIBS = $(LIBDIR)/libflite.so
-LDFLAGS += -L$(LIBDIR) -lflite $(OTHERLIBS)
+LDFLAGS += -L$(LIBDIR) -lflite -lm $(OTHERLIBS)
else
FLITELIBS = $(LIBDIR)/libflite.a
LDFLAGS += -L$(LIBDIR) -lflite -lm $(AUDIOLIBS) $(OTHERLIBS)

@ -0,0 +1,24 @@
diff -Naur flite-1.3-release/config/common_make_rules flite-1.3-release.new/config/common_make_rules
--- flite-1.3-release/config/common_make_rules 2014-02-12 09:56:23.058678651 -0800
+++ flite-1.3-release.new/config/common_make_rules 2014-02-12 11:27:18.039561163 -0800
@@ -67,6 +67,11 @@
BUILDDIRS=$(OBJDIR) $(BINDIR) $(LIBDIR)
+ifndef SO_LDFLAGS
+SO_LDFLAGS := $(LDFLAGS)
+endif
+export SO_LDFLAGS
+
ifdef SHFLAGS
FLITELIBS = $(LIBDIR)/libflite.so
LDFLAGS += -L$(LIBDIR) -lflite -lm $(OTHERLIBS)
@@ -130,7 +135,7 @@
@ rm -rf shared_os && mkdir shared_os
@ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION}
@ (cd shared_os && ar x ../$<)
- @ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os -L../ $($(@:%.so=%_LDLIBS)))
+ @ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} $(SO_LDFLAGS) -o ../$@.${PROJECT_VERSION} *.os -L../ $($(@:%.so=%_LDLIBS)))
@ ln -s $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION}
@ ln -s $@.${PROJECT_SHLIB_VERSION} $@
@ rm -rf shared_os

@ -0,0 +1,50 @@
From a85193f122b7ec0d377e0a39ac58c64f12c51085 Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos@gmail.com>
Date: Mon, 6 Jan 2014 13:45:00 +0000
Subject: [PATCH] auserver.c: Only write audio data to a file in debug builds
This isn't useful in regular builds and is actually a security
concern.
---
src/audio/auserver.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/audio/auserver.c b/src/audio/auserver.c
index 29716d3..3e838d0 100644
--- a/src/audio/auserver.c
+++ b/src/audio/auserver.c
@@ -58,9 +58,11 @@ static int play_wave_from_socket(snd_header *header,int audiostream)
int q,i,n,r;
unsigned char bytes[CST_AUDIOBUFFSIZE];
short shorts[CST_AUDIOBUFFSIZE];
+#ifdef DEBUG
cst_file fff;
fff = cst_fopen("/tmp/awb.wav",CST_OPEN_WRITE|CST_OPEN_BINARY);
+#endif
if ((audio_device = audio_open(header->sample_rate,1,
(header->encoding == CST_SND_SHORT) ?
@@ -107,7 +109,9 @@ static int play_wave_from_socket(snd_header *header,int audiostream)
for (q=r; q > 0; q-=n)
{
n = audio_write(audio_device,shorts,q);
+#ifdef DEBUG
cst_fwrite(fff,shorts,2,q);
+#endif
if (n <= 0)
{
audio_close(audio_device);
@@ -116,7 +120,9 @@ static int play_wave_from_socket(snd_header *header,int audiostream)
}
}
audio_close(audio_device);
+#ifdef DEBUG
cst_fclose(fff);
+#endif
return CST_OK_FORMAT;
--
1.8.3.1

@ -0,0 +1,50 @@
From a85193f122b7ec0d377e0a39ac58c64f12c51085 Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos@gmail.com>
Date: Mon, 6 Jan 2014 13:45:00 +0000
Subject: [PATCH] auserver.c: Only write audio data to a file in debug builds
This isn't useful in regular builds and is actually a security
concern.
---
src/audio/auserver.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/audio/auserver.c b/src/audio/auserver.c
index 29716d3..3e838d0 100644
--- a/src/audio/auserver.c
+++ b/src/audio/auserver.c
@@ -58,9 +58,11 @@ static int play_wave_from_socket(snd_header *header,int audiostream)
int q,i,n,r;
unsigned char bytes[CST_AUDIOBUFFSIZE];
short shorts[CST_AUDIOBUFFSIZE];
+#ifdef DEBUG
cst_file fff;
fff = cst_fopen("/tmp/awb.wav",CST_OPEN_WRITE|CST_OPEN_BINARY);
+#endif
if ((audio_device = audio_open(header->sample_rate,1,
(header->encoding == CST_SND_SHORT) ?
@@ -107,7 +109,9 @@ static int play_wave_from_socket(snd_header *header,int audiostream)
for (q=r; q > 0; q-=n)
{
n = audio_write(audio_device,shorts,q);
+#ifdef DEBUG
cst_fwrite(fff,shorts,2,q);
+#endif
if (n <= 0)
{
audio_close(audio_device);
@@ -116,7 +120,9 @@ static int play_wave_from_socket(snd_header *header,int audiostream)
}
}
audio_close(audio_device);
+#ifdef DEBUG
cst_fclose(fff);
+#endif
return CST_OK_FORMAT;
--
1.8.3.1

@ -0,0 +1,78 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/flite-1.2-r2.ebuild,v 1.1 2014/02/12 21:21:11 teiresias Exp $
EAPI=5
inherit eutils
DESCRIPTION="Flite text to speech engine"
HOMEPAGE="http://www.speech.cs.cmu.edu/flite/index.html"
SRC_URI="http://www.speech.cs.cmu.edu/flite/packed/${P}/${P}-release.tar.bz2
http://www.speech.cs.cmu.edu/flite/packed/${P}/${PN}_lexfix.tar.gz"
LICENSE="BSD freetts public-domain regexp-UofT BSD-2"
SLOT="0"
KEYWORDS=" ~alpha ~amd64 ~ppc ~sparc ~x86"
IUSE="static"
S=${WORKDIR}/${P}-release
src_unpack() {
unpack ${P}-release.tar.bz2
unpack ${PN}_lexfix.tar.gz
# Move the update into ${S}
cd ${PN}
tar -cf - . | (cd "${S}"; tar -xf -)
}
src_prepare() {
epatch "${FILESDIR}"/const.patch
epatch "${FILESDIR}"/${P}-tempfile.patch
}
src_configure() {
local myconf
if ! use static ; then
myconf="${myconf} --enable-shared"
fi
myconf="${myconf} --with-vox=cmu_us_kal16"
econf ${myconf}
# -j2 borks when we make the shared libs
}
src_compile() {
emake -j1
}
src_install() {
dobin bin/*
dodoc ACKNOWLEDGEMENTS README
if use static ; then
dolib.a lib/*.a
else
for lib in lib/*.so*; do
if [ -f ${lib} ]; then
dolib.so ${lib}
lib=`basename ${lib}`
majlib=`echo ${lib} | sed 's:\(\.so\.[0-9]\)\(\.[0-9]*\)*$:\1:'`
noverlib=`echo ${lib} | sed 's:\(\.so\)\(\.[0-9]*\)*$:\1:'`
dosym ${lib} /usr/lib/${majlib}
dosym ${lib} /usr/lib/${noverlib}
fi
done
fi
insinto /usr/include/flite
cd "${S}"/include
for file in *.h; do
doins ${file}
sed -i -e 's:#include "\(.*\)":#include <flite/\1>:g' \
"${D}"/usr/include/flite/${file} || die "sed failed"
done
dosym flite/flite.h /usr/include/flite.h
}

@ -0,0 +1,73 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/flite-1.3-r1.ebuild,v 1.1 2014/02/12 21:21:11 teiresias Exp $
EAPI=5
inherit eutils
DESCRIPTION="Flite text to speech engine"
HOMEPAGE="http://www.speech.cs.cmu.edu/flite/index.html"
SRC_URI="http://www.speech.cs.cmu.edu/flite/packed/${P}/${P}-release.tar.gz"
LICENSE="BSD freetts public-domain regexp-UofT BSD-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
IUSE="alsa static"
S=${WORKDIR}/${P}-release
src_prepare() {
epatch "${FILESDIR}"/${P}-tempfile.patch
if use alsa; then
epatch "${FILESDIR}"/${P}-alsa-support.patch
fi
epatch "${FILESDIR}"/${P}-shared-libs.patch
epatch "${FILESDIR}"/${P}-fix-static.patch
epatch "${FILESDIR}"/${P}-respect-ldflags.patch
epatch "${FILESDIR}"/${P}-libm.patch
}
src_configure() {
local myconf
if ! use static ; then
myconf="--enable-shared"
fi
myconf="${myconf} --with-vox=cmu_us_kal16"
econf ${myconf}
}
src_compile() {
emake -j1
}
src_install() {
dobin bin/*
dodoc ACKNOWLEDGEMENTS README
if use static ; then
dolib.a lib/*.a
else
for lib in lib/*.so*; do
if [ -f ${lib} ]; then
dolib.so ${lib}
lib=`basename ${lib}`
majlib=`echo ${lib} | sed 's:\(\.so\.[0-9]\)\(\.[0-9]*\)*$:\1:'`
noverlib=`echo ${lib} | sed 's:\(\.so\)\(\.[0-9]*\)*$:\1:'`
dosym ${lib} /usr/lib/${majlib}
dosym ${lib} /usr/lib/${noverlib}
fi
done
fi
insinto /usr/include/flite
cd "${S}"/include
for file in *.h; do
doins ${file}
sed -i -e 's:#include "\(.*\)":#include <flite/\1>:g' \
"${D}"/usr/include/flite/${file} || die "sed failed"
done
dosym flite/flite.h /usr/include/flite.h
}

@ -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-accessibility/flite/flite-1.4-r2.ebuild,v 1.3 2013/08/25 14:42:09 jer Exp $
# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/flite-1.4-r3.ebuild,v 1.1 2014/02/12 21:21:11 teiresias Exp $
EAPI=4
inherit autotools eutils
@ -30,6 +30,7 @@ get_audio() {
}
src_prepare() {
epatch "${FILESDIR}"/${P}-tempfile.patch
epatch "${FILESDIR}"/${P}-fix-parallel-builds.patch
epatch "${FILESDIR}"/${P}-respect-destdir.patch
epatch "${FILESDIR}"/${P}-ldflags.patch

@ -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-admin/eselect-sh/eselect-sh-0.4.ebuild,v 1.13 2013/06/02 08:38:00 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-sh/eselect-sh-0.4-r1.ebuild,v 1.1 2014/02/12 18:11:36 mgorny Exp $
EAPI=5

@ -0,0 +1,14 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id: sh.eselect-0.4-r1,v 1.1 2014/02/12 18:11:37 mgorny Exp $
DESCRIPTION="Manage /bin/sh (POSIX shell) implementations"
MAINTAINER="mgorny@gentoo.org"
VERSION="0.4"
SYMLINK_PATH=/bin/sh
SYMLINK_TARGETS=( bash dash zsh posh mksh busybox )
SYMLINK_DESCRIPTION='POSIX shell'
SYMLINK_CRUCIAL=1
inherit bin-symlink

@ -0,0 +1,33 @@
From 108f0e04ad2ed3dc287f1b71b987a7e9d66072ba Mon Sep 17 00:00:00 2001
From: Nikhil Komawar <nikhil.komawar@rackspace.com>
Date: Wed, 05 Feb 2014 23:39:53 +0000
Subject: Removes logging of location uri
This patch removes logging of sensitive store location uri, which
is logged when an exception occurs while trying to get the object
from the store or due to a failure in getting the store api due to
unauthorized context.
fixes bug 1275062
Change-Id: I679baa0897f242f4b8372c9c1c7ab28ae811f5e5
---
diff --git a/glance/store/__init__.py b/glance/store/__init__.py
index b16fc5b..fa80b15 100644
--- a/glance/store/__init__.py
+++ b/glance/store/__init__.py
@@ -658,9 +658,9 @@ class ImageProxy(glance.domain.proxy.Image):
return data
except Exception as e:
- LOG.warn(_('Get image %(id)s data from %(loc)s '
- 'failed: %(err)s.') % {'id': self.image.image_id,
- 'loc': loc, 'err': e})
+ LOG.warn(_('Get image %(id)s data failed: '
+ '%(err)s.') % {'id': self.image.image_id,
+ 'err': e})
err = e
# tried all locations
LOG.error(_('Glance tried all locations to get data for image %s '
--
cgit v0.9.2

@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.2.1.ebuild,v 1.2 2014/01/08 06:44:09 vapier Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.2.1-r1.ebuild,v 1.1 2014/02/13 04:36:33 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}/havana-1-CVE-2014-1948.patch" )
pkg_setup() {
enewgroup glance

@ -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-cdr/cdrkit/cdrkit-1.1.11-r1.ebuild,v 1.3 2013/02/22 18:38:34 zmedico Exp $
# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrkit/cdrkit-1.1.11-r1.ebuild,v 1.4 2014/02/13 14:49:52 blueness Exp $
EAPI=4
inherit cmake-utils eutils
@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.gz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="debug hfs unicode"
RDEPEND="app-arch/bzip2

@ -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-cdr/cdrkit/cdrkit-1.1.11-r2.ebuild,v 1.3 2014/01/22 10:38:31 nimiux Exp $
# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrkit/cdrkit-1.1.11-r2.ebuild,v 1.4 2014/02/13 14:49:52 blueness Exp $
EAPI=5
inherit cmake-utils eutils
@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.gz
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="debug hfs unicode"
RDEPEND="app-arch/bzip2

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrkit/cdrkit-1.1.11.ebuild,v 1.10 2012/03/12 10:49:08 ssuominen Exp $
# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrkit/cdrkit-1.1.11.ebuild,v 1.11 2014/02/13 14:49:52 blueness Exp $
EAPI=3
inherit cmake-utils

@ -1,10 +1,11 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-crypt/openssl-blacklist/openssl-blacklist-0.5.3.ebuild,v 1.1 2011/11/30 22:12:50 vapier Exp $
# $Header: /var/cvsroot/gentoo-x86/app-crypt/openssl-blacklist/openssl-blacklist-0.5.3.ebuild,v 1.2 2014/02/12 19:23:00 hanno Exp $
EAPI="4"
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7} )
inherit eutils versionator
inherit eutils versionator python-single-r1
MY_PV=$(get_version_component_range 1-2)
MY_P="${PN}-${MY_PV}"
@ -22,7 +23,7 @@ SLOT="0"
KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd"
IUSE=""
DEPEND="dev-lang/python"
DEPEND=""
RDEPEND="${DEPEND}"
S=${WORKDIR}/${MY_P}
@ -47,4 +48,5 @@ src_install() {
doins blacklist.RSA-${keysize}
done
python_fix_shebang "${ED}/usr/bin/openssl-vulnkey"
}

@ -1,2 +1 @@
DIST emact-2.54.0.tar.gz 577550 SHA256 d9c3171911fa127d49335c8dd1928c035446a30c2d95ec63cf6fe8e0fd3cdd44 SHA512 5bdfc189fca4be79e9d16f556f2e972a04bf438e58c9bc9f1c7e5554e42330571b026e8a5420d4fa1373a8190380f5bdd7aab7b638c3a2db1e412fce58ea1739 WHIRLPOOL 84b9c8fe0b1dd293c63c88220b881be6d4a544951d5e28dbdbf04a8c76e5b8447613c63b403166a5aed0878501a07825adfeebf2e4fa95633dbb1a3569b012ad
DIST emact-2.56.0.tar.gz 578640 SHA256 dfe5c17ed6bab49bdb46425bf616a6ce689b73f498a61c094eb97d1765007e57 SHA512 96fce3bf3e00e84abd9de0778a02cfd284689073391e6f9eb3bb4a54e8899ae32d9e8acd45d0f1d575e36f171ca148fc574c9ecc71615df9a9907ee1d30bb99d WHIRLPOOL 8d4e821c4a24c3cb2b9a5ca898a9a8e0d245242c1c0f8e2986212939d772df503222023d19918b32276e3061d92c7dbe6292a720a0255464e614254c7f7d742a

@ -1,34 +0,0 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/emact/emact-2.54.0.ebuild,v 1.3 2009/06/11 20:25:09 maekke Exp $
inherit toolchain-funcs
DESCRIPTION="EmACT, a fork of Conroy's MicroEmacs"
HOMEPAGE="http://www.eligis.com/emacs/"
SRC_URI="http://www.eligis.com/emacs/${P}.tar.gz"
LICENSE="GPL-2 BSD"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="X"
DEPEND="sys-libs/ncurses
X? (
x11-libs/libX11
x11-libs/libICE
x11-libs/libSM
)"
RDEPEND="${DEPEND}"
src_compile() {
tc-export CC
econf $(use_with X x) || die "econf failed"
emake || die "emake failed"
}
src_install() {
emake INSTALL="${D}"/usr install || die "emake install failed"
dodoc README || die "dodoc failed"
}

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/emact/emact-2.56.0.ebuild,v 1.3 2012/06/08 11:49:16 phajdan.jr Exp $
# $Header: /var/cvsroot/gentoo-x86/app-editors/emact/emact-2.56.0.ebuild,v 1.4 2014/02/12 17:58:30 ulm Exp $
EAPI=4
@ -8,7 +8,7 @@ DESCRIPTION="EmACT, a fork of Conroy's MicroEmacs"
HOMEPAGE="http://www.eligis.com/emacs/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2 BSD"
LICENSE="GPL-2+ BSD"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="X"

@ -1,3 +1,2 @@
DIST mg-20110905.tar.gz 138805 SHA256 1cd37d7e6a3eecc890a5718c38b8f38495057ba93856762a756ccee2f9618229 SHA512 b490a5a3526d35839353e138f33ac924c5afbbf7e5c9faa20ceccb82e1dc1e6a3f0726b32bac7d43dcf8a410b1b8525067da5557cf669c52a9e32d1d2f45a8a4 WHIRLPOOL 64dd179462a8c9e53946c756a4975ffd2e5bf1758a300fa699032542a6e2470f9ed03f9fe1a88ac441cf17ac20c2575f9b6c5c1c396c5a7915564fbedfb1c854
DIST mg-20130922.tar.gz 142886 SHA256 323c21489416e256d036e8d58b6b72f96e7dee393fa8e38709f5fa226c8e7dd3 SHA512 79bf02ff3d30f41c234310b33c98f9a0f9c8a1197fe12c02e108071f6bc80f0d37003076cc1a2eb1c9a88c668eeab30e8a2d0c86af13ef57dd562dc077bb229b WHIRLPOOL c358095bf8fc686a5ebbe327ac35f5812164623307e77b1cc8293f28a65893dfd1826b4412ce0800cb5b77394b2eaeaff261149f25cd075651a7783c64248ff8
DIST mg-20131118.tar.gz 144002 SHA256 b99fe10cb8473e035ff43bf3fbf94a24035e4ebb89484d48e5b33075d22d79f3 SHA512 36451ee813ac1d01df7648f4c7aff6bef5d62c2d9c57033ccecaccf1904fa1f4071cefbe9b5c55bbebcb104ee8497cc6163d3bb4f552ce223bd441bf6613d149 WHIRLPOOL f91468b062db3372969f6d5da048d8636251509650b289cd5bb2225173f08d315c5170e4634660fcc5276f5a9eafdee835a2b5f30341523ea11902d66c0ff266

@ -1,52 +0,0 @@
Fix dirname(3) call in readin and writeout functions.
https://bugs.gentoo.org/487758
Patch from OpenBSD CVS:
http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/mg/file.c.diff?r1=1.87;r2=1.89
--- mg-20130922-orig/file.c
+++ mg-20130922/file.c
@@ -210,7 +210,7 @@ readin(char *fname)
struct stat statbuf;
int status, i, ro = FALSE;
PF *ael;
- char *dp;
+ char dp[NFILEN];
/* might be old */
if (bclear(curbp) != TRUE)
@@ -255,7 +255,8 @@ readin(char *fname)
if (errno != ENOENT)
ro = TRUE;
else if (errno == ENOENT) {
- dp = dirname(fname);
+ (void)xdirname(dp, fname, sizeof(dp));
+ (void)strlcat(dp, "/", sizeof(dp));
if (stat(dp, &statbuf) == -1 && errno == ENOENT) {
/* no read-only; like emacs */
ewprintf("Use M-x make-directory RET RET to "
@@ -669,19 +670,17 @@ writeout(FILE ** ffp, struct buffer *bp, char *fn)
{
struct stat statbuf;
int s;
- char *dp;
+ char dp[NFILEN];
- dp = dirname(fn);
-
if (stat(fn, &statbuf) == -1 && errno == ENOENT) {
errno = 0;
+ (void)xdirname(dp, fn, sizeof(dp));
+ (void)strlcat(dp, "/", sizeof(dp));
if (access(dp, W_OK) && errno == EACCES) {
- ewprintf("Directory %s%s write-protected", dp,
- (dp[0] == '/' && dp[1] == '\0') ? "" : "/");
+ ewprintf("Directory %s write-protected", dp);
return (FIOERR);
} else if (errno == ENOENT) {
- ewprintf("%s%s: no such directory", dp,
- (dp[0] == '/' && dp[1] == '\0') ? "" : "/");
+ ewprintf("%s: no such directory", dp);
return (FIOERR);
}
}

@ -1,58 +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/mg/mg-20130922-r2.ebuild,v 1.1 2013/10/22 10:34:28 ulm Exp $
EAPI=5
inherit eutils toolchain-funcs
DESCRIPTION="MicroGnuEmacs, a port from the BSDs"
HOMEPAGE="http://homepage.boetes.org/software/mg/"
SRC_URI="http://homepage.boetes.org/software/mg/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~x86"
IUSE="livecd"
RDEPEND="sys-libs/ncurses"
DEPEND="${RDEPEND}
virtual/pkgconfig
dev-libs/clens"
src_prepare() {
epatch "${FILESDIR}"/${P}-dirname.patch
epatch_user
# create our own Makefile to avoid BSD make
echo -e 'SRCS =' *.c '\n\nmg: $(SRCS:.c=.o)' \
'\n\t$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)' >Makefile || die
# remove OpenBSD specific easter egg
sed -i -e 's/theo\.c//' Makefile || die
sed -i -e '/theo_init/d' main.c || die
# fix path to tutorial in man page
sed -i -e "s:doc/mg/:doc/${PF}/:" mg.1 || die
}
src_compile() {
emake CC="$(tc-getCC)" \
CPPFLAGS="${CPPFLAGS} -DFKEYS -DREGEX -DXKEYS \
-I${EPREFIX}/usr/include/clens" \
LDLIBS="-lclens $("$(tc-getPKG_CONFIG)" --libs ncurses)"
}
src_install() {
dobin mg
doman mg.1
dodoc README README_PORTING tutorial
# don't compress the tutorial, otherwise mg cannot open it
docompress -x /usr/share/doc/${PF}/tutorial
}
pkg_postinst() {
if use livecd; then
[[ -e ${EROOT}/usr/bin/emacs ]] || ln -s mg "${EROOT}"/usr/bin/emacs
fi
}

@ -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-editors/mg/mg-20131118.ebuild,v 1.1 2013/11/18 01:06:38 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-editors/mg/mg-20131118.ebuild,v 1.2 2014/02/13 14:24:37 jer Exp $
EAPI=5
@ -12,7 +12,7 @@ SRC_URI="http://homepage.boetes.org/software/mg/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~x86"
KEYWORDS="~amd64 hppa ~x86"
IUSE="livecd"
RDEPEND="sys-libs/ncurses"

@ -1,8 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emacs/company-mode/company-mode-0.6.11.ebuild,v 1.1 2014/01/01 17:44:25 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emacs/company-mode/company-mode-0.6.11.ebuild,v 1.2 2014/02/13 18:19:49 ulm Exp $
EAPI=5
NEED_EMACS=23
inherit elisp
@ -17,8 +18,7 @@ IUSE="ropemacs +semantic"
# Note: company-mode supports many backends, and we refrain from including
# them all in RDEPEND. Only depend on things that are needed at build time.
DEPEND="|| ( app-emacs/nxml-mode >=virtual/emacs-23 )
ropemacs? ( app-emacs/pymacs )
DEPEND="ropemacs? ( app-emacs/pymacs )
semantic? ( virtual/emacs-cedet )"
RDEPEND="${DEPEND}
ropemacs? ( dev-python/ropemacs )"

@ -1,8 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emacs/company-mode/company-mode-0.6.14.ebuild,v 1.1 2014/02/10 20:14:40 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emacs/company-mode/company-mode-0.6.14.ebuild,v 1.2 2014/02/13 18:19:49 ulm Exp $
EAPI=5
NEED_EMACS=23
inherit elisp
@ -17,8 +18,7 @@ IUSE="ropemacs +semantic"
# Note: company-mode supports many backends, and we refrain from including
# them all in RDEPEND. Only depend on things that are needed at build time.
DEPEND="|| ( app-emacs/nxml-mode >=virtual/emacs-23 )
ropemacs? ( app-emacs/pymacs )
DEPEND="ropemacs? ( app-emacs/pymacs )
semantic? ( virtual/emacs-cedet )"
RDEPEND="${DEPEND}
ropemacs? ( dev-python/ropemacs )"

@ -1,3 +1,2 @@
DIST folding-2007.0506.el.bz2 48912 SHA256 2753dd5b7f34a04da5da4f5242df9a7b9f364c6c49682f43850190fabec1e218 SHA512 8acf571d3730031901e3ab93fa5b7c16e6cba940c302477660abeaf6de117e22eb553307079261dce7912848a8b6257f87d2e82b77a43eda5a95a330b9611a57 WHIRLPOOL 1517ea17e0e8c72c172b8601f75312c5e76ee494fb2744582cf91ce3173182b3151e41d5463a4631bbba6a2dc18bb28c8c36f2f270a8d9e41e50dbdd8708d6d1
DIST folding-2009.0905.0811.el.bz2 49421 SHA256 3fa14133e1821b2b7b6063a6e89ff3b83ef77c8fd7f0199e4665915297bc0016 SHA512 2dcc2d525990677cb338291c77bfba5e6b2ca3812d7d4b8103845f21b759f5ee34cad7c277e01087e1920a1c1ada3f07443aa2c1c6142b29b6e59542a900199c WHIRLPOOL 6cc99b393aa9f5d1b71d70986971ed3592ce74cf4e7d02127ec308232fd9c7324651a1c4bfa5f9ae571d378d81b30eeac62d409096b98dcc3d8d3bb99ffce4b1
DIST folding-2012.0226.1623.el.bz2 49503 SHA256 d1d00dd48284c7509c24003d56e8cf86c46839880d6775efe76682e1cd859482 SHA512 efb645e46e55174f2b538b6812f36d08f576f765ffffdf25af756c852e7bfd6455cb3bc3a540089a60600251b2c144384b7f58b412840a95ce614efd9d5b50c9 WHIRLPOOL 42a17c72d91cee51bec9d37466ef1e9b9812ac05cf01b6dc006e0ec204bff2edc84a2a776e656deb86ca17917eaf7d1716c849d67cdcf9f6c5a1017c99cf9588
DIST folding-2013.0613.1821.el.xz 52164 SHA256 bc818ec6a07537d716b28ea1b1a3798c042503b967578e387894599ea1ab5bf3 SHA512 9eb7cf4e1b01d7f37969bab0a66ad564da3742981ec0623b3100b0aef1bb997a80c91b88286ac673775edd197110496e1849210cc40fe310d8a478471cc1ec53 WHIRLPOOL b67c9e477738c0cc0ed88cae486eff12e773d9ed0e32a9c54981861e6e492ece2d98d100947d39c6add87b8121044d4f55ede0ab3f5e36df6e824cbd46ed582d

@ -1,17 +0,0 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emacs/folding/folding-2007.0506.ebuild,v 1.3 2009/06/07 18:59:24 klausman Exp $
inherit elisp
DESCRIPTION="A folding-editor-like Emacs minor mode"
HOMEPAGE="http://www.emacswiki.org/cgi-bin/wiki/FoldingMode"
# taken from http://tiny-tools.cvs.sourceforge.net/*checkout*/tiny-tools/tiny-tools/lisp/other/folding.el
SRC_URI="mirror://gentoo/${P}.el.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 x86"
IUSE=""
SITEFILE="70${PN}-gentoo.el"

@ -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/folding/folding-2012.0226.1623.ebuild,v 1.4 2013/02/15 23:03:37 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emacs/folding/folding-2012.0226.1623.ebuild,v 1.5 2014/02/14 08:13:16 ulm Exp $
EAPI=5
@ -15,4 +15,4 @@ LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="alpha amd64 x86"
SITEFILE="70${PN}-gentoo.el"
SITEFILE="50${PN}-gentoo.el"

@ -1,17 +1,18 @@
# Copyright 1999-2012 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/folding/folding-2009.0905.0811.ebuild,v 1.5 2012/12/20 18:49:26 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emacs/folding/folding-2013.0613.1821.ebuild,v 1.1 2014/02/14 08:13:16 ulm Exp $
EAPI=5
inherit elisp
DESCRIPTION="A folding-editor-like Emacs minor mode"
HOMEPAGE="http://www.emacswiki.org/cgi-bin/wiki/FoldingMode"
# taken from http://git.savannah.gnu.org/cgit/emacs-tiny-tools.git
SRC_URI="mirror://gentoo/${P}.el.bz2"
SRC_URI="http://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="alpha amd64 x86"
IUSE=""
KEYWORDS="~alpha ~amd64 ~x86"
SITEFILE="70${PN}-gentoo.el"
SITEFILE="50${PN}-gentoo.el"

@ -1,2 +1 @@
DIST lua-mode-20100617.el.bz2 10940 SHA256 d0c1294e4f808077ea37119ec9025c64ba21459ae5b6e8c24b55c092fc134662 SHA512 3ae06c0c81d84611f30cb2825a23bea644884663dfcc046f8d57fce0359c16d31bfae5402ad1107991bff7f900ad64eb74dce25ce8e3994931573eaaee2c5671 WHIRLPOOL d734cd7512b20bda46dddfe3becfbf9d7086ac14454cae55b54c7907a2c82c5e3d3a44b37f9716029560c34b167334437916ea00167701d4e182f000bc16dc1b
DIST lua-mode-20130419.tar.gz 26236 SHA256 75c1696421983fbb58946ea649d2917f0deefc8b4f1dbc16b819e0cd603e396a SHA512 1fecd953b5b08dad26345c6e0d2006f35f92082d7cd244e4d668808a2694271605f10eb15d7b62ab8fbdf029fa6bac8bcebe8c8d4ef782dbd63ebcce8abc8439 WHIRLPOOL 4477da3bfb707459c14cefbc55ca7303b1774627c143cfe1d2dc3e70a7843fd7f9d0090f4640b934482a39b020afaf09b4dfd0b8ef10fd46f71b3d2c799e6347

@ -1,17 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emacs/lua-mode/lua-mode-20100617-r1.ebuild,v 1.10 2013/06/25 20:43:20 ulm Exp $
inherit elisp
DESCRIPTION="An Emacs major mode for editing Lua scripts"
HOMEPAGE="http://lua-users.org/wiki/LuaEditorSupport"
# taken from http://luaforge.net/frs/download.php/4628/lua-mode.el
SRC_URI="mirror://gentoo/${P}.el.bz2"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux"
IUSE=""
SITEFILE="50${PN}-gentoo.el"

@ -1,2 +1 @@
DIST mmm-mode-0.4.8.tar.gz 231318 SHA256 dda9b855e39c33634ff2dc521c96ab0548d9d712d064e06f3850f3b709ba0226 SHA512 a377eb7a301a3e59a52befb709cec6937dcbc9c16bc2431da57877986818487d8d00239b44fe916655adbd0a19ab1f2e856f8ae1a71393267cc5accff5ba7848 WHIRLPOOL 84e8b4e488e776cd4e042b92f6fce91ab8728dc37ca9f7826ca9475d124d2eea491bb286a0a873a96954070b5d3f2ecec74fd78213d7a926b1d51b26ab517557
DIST mmm-mode-0.5.1.tar.gz 247841 SHA256 d0b4bfc9b30bd089e58bd513664f604b0e2614b4056f2f44bd356868d53b10eb SHA512 83fad0abe26af7627fa7416fca5936bb8347a00c5428537b767c98201af137f2d62eceaca09cb9e7572edc9a93c5ea6ceca422e55984d4bcd5f69ec060c2ffee WHIRLPOOL 28a81aea21756fb3efc1cd4b591e109aaed69ddc86f42c5c5604150105c558810b12130c4acab523dae480622ee6e6ee5fd70812771213341d6b3286ca6eb3d1

@ -1,15 +0,0 @@
--- mmm-mode-0.4.8-orig/mmm-utils.el
+++ mmm-mode-0.4.8/mmm-utils.el
@@ -78,7 +78,11 @@
(save-match-data
(dolist (pair arg-pairs)
(while (string-match (car pair) string)
- (setq string (replace-match (cdr pair) t t string))))))
+ (setq string (replace-match
+ (if (fboundp 'format-mode-line)
+ (format-mode-line (cdr pair))
+ (cdr pair))
+ t t string))))))
string)
(defun mmm-format-matches (string &optional on-string)

@ -1,29 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emacs/mmm-mode/mmm-mode-0.4.8-r2.ebuild,v 1.5 2013/05/04 12:43:53 ulm Exp $
inherit elisp
DESCRIPTION="Enables the user to edit different parts of a file in different major modes"
HOMEPAGE="http://mmm-mode.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
ELISP_PATCHES="${P}-format-mode-line.patch"
SITEFILE="50${PN}-gentoo.el"
src_compile() {
econf --with-emacs
emake -j1 || die "emake failed"
}
src_install() {
elisp-install ${PN} *.el *.elc || die
elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
doinfo *.info* || die
dodoc AUTHORS ChangeLog FAQ NEWS README README.Mason TODO
}

@ -1,3 +1,2 @@
DIST libvirt-0.8.8.tar.gz 14150587 SHA256 030aea3728917053555bec98d93d2855e8a603b758c0b2a5d57ac48b4f39e113 SHA512 bcaca45a53b4068c6a6145aae605df74b41cb14a3da4e4ed9a29fea02a4f00062ebdd17f64201b2d83f1f19724507793fac63e1456a213779b1deff426dcd91f WHIRLPOOL 644e086608e19d6fc149725233aa1a0711435c695f54cd47645e5ba4a583fd76d2e3553e4746ce5f7ea64592219f859fecbe1db2ea0fcbe65832fd9b0b9fce47
DIST libvirt-0.9.0-rc1.tar.gz 14386650 SHA256 40d148e82944c3fc00a9a7fa73ddffdb858065b635d537d40b3c2dc86f90e3f7 SHA512 df75a02fcb6f5126fb55607a80a766dc813c2aa223b9e10acf2fe43620ec1b3a8fd1ae6609d5c2bd8450c310ba14b54cf317cf57d02be25be858944dca4a7aff WHIRLPOOL 17c93cc05218bb09defd40863ae2c97c65cc8f29f05cdefa2d292c9f9fe777ce6e5f413df248aa4c69cb96173d24f7cd0f9f625b7660170e1640163e6b26d62b
DIST libvirt-0.9.7.tar.gz 17853636 SHA256 29ff05bfe5177d6680c02c279ed2573dcfae993f2824bffa192a3a2cdd05af23 SHA512 ac082f3872b37fc7aad891ba3f2a9614bdc85123b3d626fc7a2e43327a7ec346a0ec154c25161592a4337e3f694d9b27d031544190dec7d6086343f15fe9ba2d WHIRLPOOL 1704503c979b20a7bb31da4007724b7fd537d7f4f95dc7c0d8929d24f5f7c297c4d1f4d4d2a541265fa9c87b2bfba1d27a8b61c9ab29b092916dedb7a5a52a23
DIST libvirt-1.2.1.tar.gz 27228694 SHA256 bc29b5751bf36753c17e2fdbb75e70c7b07df3d9527586d3426e90f5f4abb898 SHA512 6184840623156ca01ee7f59078ebf031bc84c25b37bb110372c7bcf230a79b74e267475f989fb73db5e3c096dcc74f03cb30adfc5de022f756ed2cd6ab05bfd0 WHIRLPOOL 75c2a37b1101950474aad8931d999564ff575512d38c9e8d2cf989cef3ad7057853046b738b20bd77be80c1e6677319aea7227797ae95ce91512dc36bd05a142

@ -1,53 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-0.9.0_rc1.ebuild,v 1.1 2011/03/28 07:58:56 flameeyes Exp $
EAPI=2
#BACKPORTS=
NEED_EMACS=23
inherit elisp eutils
MY_P="libvirt-${PV/_rc/-rc}"
DESCRIPTION="Extension for nxml-mode with libvirt schemas"
HOMEPAGE="http://www.libvirt.org/"
SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
${BACKPORTS:+mirror://gentoo/${MY_P}-backports-${BACKPORTS}.tar.bz2}"
# This is the license of the package, but the schema files are
# provided without license, maybe it's bad.
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
# Yes this requires Java, but I'd rather not repackage this, if you
# know something better in C, I'll be glad to use that.
DEPEND="app-text/trang"
RDEPEND=""
SITEFILE=60${PN}-gentoo.el
S="${WORKDIR}/${MY_P%-rc*}"
src_prepare() {
[[ -d "${WORKDIR}/patches" ]] && \
EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" EPATCH_SOURCE="${WORKDIR}/patches" epatch
}
src_compile() {
emake -C docs/schemas -f "${FILESDIR}/Makefile-trang" || die "trang failed"
}
src_test() {
# No we don't need tests here… trang will take care of checking
# the well-formedness of the schema files for us
:
}
src_install() {
insinto ${SITEETC}/${PN}
doins "${FILESDIR}/schemas.xml" docs/schemas/*.rnc || die "install failed"
elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
}

@ -1,6 +1,6 @@
# Copyright 1999-2012 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/nxml-libvirt-schemas/nxml-libvirt-schemas-0.9.7.ebuild,v 1.1 2012/03/19 18:27:43 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-0.9.7.ebuild,v 1.2 2014/02/13 19:50:33 ulm Exp $
EAPI=4
@ -18,10 +18,9 @@ SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
# This is the license of the package, but the schema files are
# provided without license, maybe it's bad.
LICENSE="LGPL-2.1"
LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
# Yes this requires Java, but I'd rather not repackage this, if you
# know something better in C, I'll be glad to use that.

@ -1,8 +1,8 @@
# Copyright 1999-2011 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/nxml-libvirt-schemas/nxml-libvirt-schemas-0.8.8.ebuild,v 1.3 2011/03/28 07:58:56 flameeyes Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-1.2.1.ebuild,v 1.1 2014/02/13 19:50:33 ulm Exp $
EAPI=2
EAPI=5
#BACKPORTS=
NEED_EMACS=23
@ -18,36 +18,39 @@ SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
# This is the license of the package, but the schema files are
# provided without license, maybe it's bad.
LICENSE="LGPL-2.1"
LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
# Yes this requires Java, but I'd rather not repackage this, if you
# know something better in C, I'll be glad to use that.
DEPEND="app-text/trang"
RDEPEND=""
SITEFILE=60${PN}-gentoo.el
SITEFILE="60${PN}-gentoo.el"
S="${WORKDIR}/${MY_P%-rc*}"
src_prepare() {
[[ -d "${WORKDIR}/patches" ]] && \
EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" EPATCH_SOURCE="${WORKDIR}/patches" epatch
if [[ -d "${WORKDIR}/patches" ]]; then
EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" \
EPATCH_SOURCE="${WORKDIR}/patches" \
epatch
fi
}
src_compile() {
emake -C docs/schemas -f "${FILESDIR}/Makefile-trang" || die "trang failed"
emake -C docs/schemas -f "${FILESDIR}/Makefile-trang"
}
src_test() {
# No we don't need tests here trang will take care of checking
# No we don't need tests here... trang will take care of checking
# the well-formedness of the schema files for us
:
}
src_install() {
insinto ${SITEETC}/${PN}
doins "${FILESDIR}/schemas.xml" docs/schemas/*.rnc || die "install failed"
elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
doins "${FILESDIR}/schemas.xml" docs/schemas/*.rnc
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
}

@ -0,0 +1 @@
DIST redo+-1.19.el.xz 4160 SHA256 71376025c285c9baf7dd24e3ca2d99c8ec920a160a90156ff0fc02dccec3c2b4 SHA512 e6e436b3e11d90b637e66328f2f1bfeffe0c7fe4e4f1778825e95cdb2bdf934797e9ed5563f8d83bef4fcdbf5fa4f4ab4d85bcd35b967615fdd5bce45ba39d95 WHIRLPOOL 20da0f2c05de55df019bdbd584f4564e95effad9bc18f4b092c8c435c7912e2e70643c72e72fc431d0ab4ba69a1715ea8f523ae22af862a7ab74cf96bd40d2ed

@ -0,0 +1 @@
(add-to-list 'load-path "@SITELISP@")

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>php</herd>
<herd>emacs</herd>
</pkgmetadata>

@ -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/app-emacs/redo+/redo+-1.19.ebuild,v 1.1 2014/02/13 20:46:56 ulm Exp $
EAPI=5
inherit readme.gentoo elisp
DESCRIPTION="Redo/undo system for Emacs"
HOMEPAGE="http://www.emacswiki.org/emacs/RedoPlus
http://www11.atwiki.jp/s-irie/pages/18.html"
# taken from http://www.emacswiki.org/emacs/${PN}.el
SRC_URI="http://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~x86"
SITEFILE="50${PN}-gentoo.el"
DOC_CONTENTS="Add \"(require 'redo+)\" to your ~/.emacs file
to enable the redo/undo system."

@ -1,16 +1,18 @@
# Copyright 1999-2009 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/thinks/thinks-1.9.ebuild,v 1.1 2009/10/15 19:32:28 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emacs/thinks/thinks-1.9.ebuild,v 1.2 2014/02/13 21:00:54 ulm Exp $
EAPI=5
inherit elisp
DESCRIPTION="Insert text in a think bubble"
HOMEPAGE="http://www.davep.org/emacs/"
SRC_URI="mirror://gentoo/${P}.el.bz2"
# taken from http://www.davep.org/emacs/${PN}.el
SRC_URI="http://dev.gentoo.org/~ulm/distfiles/${P}.el.bz2"
LICENSE="GPL-2"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="alpha amd64 x86"
IUSE=""
SITEFILE="50${PN}-gentoo.el"

@ -1,4 +1,3 @@
DIST tuareg-mode-1.45.6.tar.bz2 46822 SHA256 2f22834259a6b0c065a6528a519eda3d0164a9bf2de8a5f7c041d6a91777261b SHA512 265bf8de370c783f5fdb4228da7146919d72aba5b1304876b4cce574a0422d8732ed5a2b0bebb2626fb28d1b1f1ee5a3300768aed63f1baaa7b209fe693e4f41 WHIRLPOOL 6fcaddbf73528934c1e0d164100dbeaae2e65db4f9b550f145d4f6903a6c402c696aebee16c84247dec1c6af4ba25981c727790a48d377d1422b4cb3ae443967
DIST tuareg-2.0.7.tar.gz 57999 SHA256 7ba8016cdd2195d37ccc1c0e300323f807b8bdc6d3ce9e622ae9a36355d3a9c9 SHA512 6cf290879dd9b7993a046dbebb9944a245fa82d1e7849b46f477b7217b46026ce5195e40e4d9b990e047a03680197827334e6d54d82610da6fc2e62386357d42 WHIRLPOOL 19b6c8fb7e7b6427499aa7aec0b22e0152ca35e93c042c2f3e4a760a76ba4c89c7951df25a128414a2f7df5aee7d76aea255c0b235065c9dcae4e62ed3c05c86
DIST tuareg-mode-2.0.1.tgz 64555 SHA256 d368fdd9c4a847572adb1f21a5b205ec527209c7b6524fc1e7f2ea848d525e13 SHA512 4eb718417aca79d00288d4b2ed8de3eaa2de3a4b319332d781f2289df563488cf556c97cf9f6fdedda2e63ed98949ddb0d9c3aecd70a4df8fe20d0d989ce1872 WHIRLPOOL 8d83f78b3a3654dc0db2ec55c8e3b1ba374fa4ea314c6a3de53186b25f1edef0f46d3fb00d196cabf4e0cf81b7523b1c6fac78576947a6b0507815a1ca3e30f5
DIST tuareg-mode-2.0.4.tgz 64855 SHA256 35ec56ac5f1380e99ca4db1d5dcecaf3c8f799e17ab1349729dc6305613361ff SHA512 4181e432af0d958007c23957b5fd169a2c5592179296be3577c48d687363d940ef9fb27facd495d5d607e0545fad138c88e61371a4bc39eebcddb6da2c5dc7e6 WHIRLPOOL 00c8a8e8c443c1bb6407c87061e4723b93a9ffa32c6867ac7a1af42cdcb9a9d9dace71a876e1b6350479aeaf9c54d5348d094f7232abf622b838f18e6c36f534
DIST tuareg-mode-2.0.6.tgz 54916 SHA256 ea79ac24623b82ab8047345f8504abca557a537e639d16ce1ac3e5b27f5b1189 SHA512 a7162daea30baa38bf1673b62ac545936a24b87b5e4d65329304ce5da68e151af1ef9f6e7720067f1f741614b3b6e1dfeab7080c4e9e7ebf14af594f3a0b0d46 WHIRLPOOL 544c02fae9db45fba58b33d8ba2b3ae2acc16eedc7e9eb2d096a2b6869f69ac9f905c1d1f73b1b1a2417daa523905842cd08b7921e944a22fa4ab334a186093d

@ -0,0 +1,6 @@
(add-to-list 'load-path "@SITELISP@")
(autoload 'tuareg-mode "tuareg" "Major mode for editing Caml code" t)
(autoload 'tuareg-run-ocaml "tuareg" "Run an OCaml toplevel process." t)
(autoload 'ocamldebug "ocamldebug" "Run the Caml debugger" t)
(defalias 'camldebug 'ocamldebug)
(add-to-list 'auto-mode-alist '("\\.ml[iylp]?\\'" . tuareg-mode))

@ -1,22 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emacs/tuareg-mode/tuareg-mode-1.45.6.ebuild,v 1.6 2011/11/06 17:30:54 armin76 Exp $
inherit elisp
DESCRIPTION="An Objective Caml/Camllight mode for Emacs"
HOMEPAGE="http://www-rocq.inria.fr/~acohen/tuareg/index.html.en"
SRC_URI="http://www-rocq.inria.fr/~acohen/tuareg/mode/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE=""
SITEFILE=50${PN}-gentoo.el
DOCS="HISTORY LISEZMOI README"
src_unpack() {
unpack ${A}
rm "${S}"/sym-lock.* # works only with XEmacs
}

@ -1,6 +1,6 @@
# Copyright 1999-2012 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/tuareg-mode/tuareg-mode-2.0.1.ebuild,v 1.6 2012/06/14 05:42:34 xmw Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emacs/tuareg-mode/tuareg-mode-2.0.1.ebuild,v 1.7 2014/02/13 21:23:41 ulm Exp $
EAPI=4
@ -10,7 +10,7 @@ DESCRIPTION="An Objective Caml/Camllight mode for Emacs"
HOMEPAGE="http://forge.ocamlcore.org/projects/tuareg/"
SRC_URI="http://forge.ocamlcore.org/frs/download.php/410/${P}.tgz"
LICENSE="GPL-2"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE=""

@ -1,26 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emacs/tuareg-mode/tuareg-mode-2.0.4.ebuild,v 1.3 2011/11/06 17:30:54 armin76 Exp $
EAPI=4
inherit elisp
DESCRIPTION="An Objective Caml/Camllight mode for Emacs"
HOMEPAGE="http://forge.ocamlcore.org/projects/tuareg/"
SRC_URI="http://forge.ocamlcore.org/frs/download.php/514/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
IUSE=""
S="${WORKDIR}/tuareg-${PV}"
ELISP_PATCHES="${PN}-2.0.1-make_install.patch"
SITEFILE="50${PN}-gentoo.el"
src_install() {
emake DEST="${D}/usr/share/emacs/site-lisp/tuareg-mode" install
elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
dodoc HISTORY README
}

@ -1,6 +1,6 @@
# Copyright 1999-2012 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/tuareg-mode/tuareg-mode-2.0.6.ebuild,v 1.1 2012/05/27 15:41:00 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emacs/tuareg-mode/tuareg-mode-2.0.6.ebuild,v 1.2 2014/02/13 21:23:41 ulm Exp $
EAPI=4
@ -10,12 +10,11 @@ DESCRIPTION="An Objective Caml/Camllight mode for Emacs"
HOMEPAGE="http://forge.ocamlcore.org/projects/tuareg/"
SRC_URI="http://forge.ocamlcore.org/frs/download.php/882/${P}.tgz"
LICENSE="GPL-2"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
IUSE=""
S="${WORKDIR}/tuareg-${PV}"
ELISP_REMOVE="tuareg-pkg.el"
SITEFILE="50${PN}-gentoo.el"
SITEFILE="50${PN}-gentoo-2.0.6.el"
DOCS="README"

@ -0,0 +1,20 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emacs/tuareg-mode/tuareg-mode-2.0.7.ebuild,v 1.1 2014/02/13 21:23:41 ulm Exp $
EAPI=5
inherit elisp
DESCRIPTION="An Objective Caml/Camllight mode for Emacs"
HOMEPAGE="http://forge.ocamlcore.org/projects/tuareg/"
SRC_URI="http://forge.ocamlcore.org/frs/download.php/1304/tuareg-${PV}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
S="${WORKDIR}/tuareg-${PV}"
ELISP_REMOVE="tuareg-pkg.el tuareg-site-file.el"
SITEFILE="50${PN}-gentoo-2.0.6.el"
DOCS="README"

@ -1,3 +1,2 @@
DIST vm-7.19.tar.gz 381658 SHA256 54bdd076bb98cad57a71fb986d131963e97a13cc71f15819d32691e3c0c5bdb0 SHA512 1faa19ea102dc730c147039e5eb1c5ad63ad1dc06ca5813710ed59f09d7731e9cc5724d3b48d28c1209ca0be75f62350f4de4e84df8faffee3fb4751767c106e WHIRLPOOL 90ca50ed73ffcceed79c85c2b0f25fe5dd529df47a02393308981b949027db2b5e85a3ebcf16a420a33762f418dce3209d456d1bf008a5e74efed3b6435d7f25
DIST vm-8.1.2.tgz 703527 SHA256 c779f65d422ea169a1030b1c86c72e8b6f8e6c589396331c4688d8e1d0814636 SHA512 6b879e237d6509ecd95aff3fb5e26018cb38dd19b29a57545bd28b0ca45961a7106cefd6fdd42e123119ac465a4b9ef66b683c47a9f1d9ac683a954b484a0ff4 WHIRLPOOL 2c459cadc4944ee8e5719cfe5d5b5edda281e58edd13ce697748b3b2da2bb6d085b5473c069da3521618ad86a7239e0cfd8b65ecccc63b6e64665aaa37bcea8f
DIST vm-8.2.0b.tgz 839789 SHA256 6945821a521844a429ae3d0e25db69755185fa848343fdc3c754ab16344d2a12 SHA512 37b642975e8fe7e350c0a648f83608b28d8616417d376d9888c89b37c90d8bdb3c91cdc4c91a0f5072d29ac81bfea3d88f9b36699379bf8a5bdd15dd5a70858d WHIRLPOOL c35abe4d3ae3e9470733d761b3f6b8087dbda19b68cc99ed73b7d489e218e6fa257defccca72ed1b242d447ee43041da9bd8a3482d5b8df3893d5c81203d1578

@ -1,10 +0,0 @@
(add-to-list 'load-path "@SITELISP@")
(setq vm-toolbar-pixmap-directory "@SITEETC@")
(setq vm-image-directory "@SITEETC@")
(autoload 'vm "vm" "Start VM on your primary inbox." t)
(autoload 'vm-other-frame "vm" "Like `vm' but starts in another frame." t)
(autoload 'vm-visit-folder "vm" "Start VM on an arbitrary folder." t)
(autoload 'vm-visit-virtual-folder "vm" "Visit a VM virtual folder." t)
(autoload 'vm-mode "vm" "Run VM major mode on a buffer" t)
(autoload 'vm-mail "vm" "Send a mail message using VM." t)
(autoload 'vm-submit-bug-report "vm" "Send a bug report about VM." t)

@ -1,18 +0,0 @@
--- vm-digest.el~ 2003-05-03 23:31:52.000000000 +0200
+++ vm-digest.el 2005-10-06 16:41:56.000000000 +0200
@@ -179,6 +179,7 @@
(goto-char start)
(while (= (following-char) ?\n)
(delete-char 1)))
+ (insert ?\n)
(insert (vm-trailing-message-separator folder-type)))
((vm-mime-types-match "multipart/digest"
(car (vm-mm-layout-type layout)))
@@ -202,6 +203,7 @@
(goto-char start)
(while (= (following-char) ?\n)
(delete-char 1)))
+ (insert ?\n)
(insert (vm-trailing-message-separator folder-type))
(setq part-list (cdr part-list))))
(t (error

@ -1,44 +0,0 @@
diff -ur vm-7.19.orig/base64-decode.c vm-7.19/base64-decode.c
--- vm-7.19.orig/base64-decode.c 1997-09-18 05:06:05.000000000 +0200
+++ vm-7.19/base64-decode.c 2007-02-24 08:57:57.000000000 +0100
@@ -3,6 +3,7 @@
/* BASE64 on stdin -> converted data on stdout */
#include <stdio.h>
+#include <stdlib.h>
#ifdef _WIN32
#ifndef WIN32
diff -ur vm-7.19.orig/base64-encode.c vm-7.19/base64-encode.c
--- vm-7.19.orig/base64-encode.c 1997-09-18 05:06:05.000000000 +0200
+++ vm-7.19/base64-encode.c 2007-02-24 08:57:54.000000000 +0100
@@ -7,6 +7,7 @@
*/
#include <stdio.h>
+#include <stdlib.h>
#ifdef _WIN32
#ifndef WIN32
diff -ur vm-7.19.orig/qp-decode.c vm-7.19/qp-decode.c
--- vm-7.19.orig/qp-decode.c 2000-03-05 21:59:04.000000000 +0100
+++ vm-7.19/qp-decode.c 2007-02-24 08:57:46.000000000 +0100
@@ -4,6 +4,7 @@
#include <stdio.h>
#include <string.h>
+#include <stdlib.h>
#ifdef _WIN32
#ifndef WIN32
diff -ur vm-7.19.orig/qp-encode.c vm-7.19/qp-encode.c
--- vm-7.19.orig/qp-encode.c 2000-11-30 22:19:52.000000000 +0100
+++ vm-7.19/qp-encode.c 2007-02-24 08:57:35.000000000 +0100
@@ -7,6 +7,7 @@
*/
#include <stdio.h>
+#include <stdlib.h>
#ifdef _WIN32
#ifndef WIN32

@ -1,13 +0,0 @@
Fixes installation with Emacs 23 where only a single vm.info file is created.
--- vm-7.19-orig/Makefile 2003-03-31 01:51:43.000000000 +0200
+++ vm-7.19/Makefile 2009-09-10 09:46:23.000000000 +0200
@@ -115,7 +115,7 @@
install-info: vm.info
test -d $(INFODIR) || mkdir -p $(INFODIR)
- cp vm.info vm.info-* $(INFODIR)
+ cp vm.info* $(INFODIR)
install-vm: vm.elc
test -d $(LISPDIR) || mkdir -p $(LISPDIR)

@ -1,13 +0,0 @@
--- vm.texinfo~ 2004-09-29 09:10:15.000000000 +0200
+++ vm.texinfo 2007-04-05 00:57:50.000000000 +0200
@@ -1,8 +1,9 @@
\input texinfo @comment -*-Text-*-
@setfilename vm.info
@settitle VM User's Manual
+@dircategory Emacs
@direntry
-* VM:: A mail reader.
+* VM: (vm). A mail reader.
@end direntry
@iftex
@finalout

@ -1,46 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-7.19-r4.ebuild,v 1.7 2013/04/04 21:17:46 ulm Exp $
inherit elisp eutils
DESCRIPTION="An emacs major mode for reading and writing e-mail with support for GPG and MIME."
HOMEPAGE="http://www.wonderworks.com/vm/"
SRC_URI="ftp://ftp.uni-mainz.de/pub/software/gnu/${PN}/${P}.tar.gz
ftp://ftp.uu.net/networking/mail/${PN}/${P}.tar.gz"
LICENSE="GPL-1+"
SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE=""
SITEFILE="50${PN}-gentoo-${PV}.el"
src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}/vm-info-dir-fix-gentoo.patch"
epatch "${FILESDIR}/${P}-burst-digest.patch"
epatch "${FILESDIR}/${P}-gcc4.patch"
epatch "${FILESDIR}/${P}-install-info.patch"
}
src_compile() {
make prefix="${D}/usr" \
INFODIR="${D}/usr/share/info" \
LISPDIR="${D}${SITELISP}/${PN}" \
PIXMAPDIR="${D}${SITEETC}/${PN}" \
all || die
}
src_install() {
make prefix="${D}/usr" \
INFODIR="${D}/usr/share/info" \
LISPDIR="${D}${SITELISP}/${PN}" \
PIXMAPDIR="${D}${SITEETC}/${PN}" \
install || die
elisp-install ${PN} *.el
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
dodoc README
}

@ -3,4 +3,6 @@ DIST ipxe.tar.gz 2867999 SHA256 632ce8c193ccacc3012bd354bdb733a4be126f7c098e1119
DIST seabios-0-20121121.tar.bz2 2199282 SHA256 f7f67181c6c0b4cea3a9db48e2569fdcbbc81b732a2f672079c42fb44153ee62 SHA512 4f886088ebaa911590b8cb19db5c5dbc8f1384d2d5a7c4bf04df083e177513b3123b1839dad744171670eded8b69ce092a774288aec1804d00aa32b1b6778599 WHIRLPOOL f2e62682d7213ee5eaecbc2590637ef36d9c86f746840c0ee758c0c153139f485032ea2cd098c87bb8a2b5f17f91375b8fb65599e3b71b45b1645df85a88887f
DIST seabios-dir-remote-20130720.tar.gz 3201017 SHA256 0cf06b54e8ae1cfc25f2942eea1490a9e7e01f478541577025f6eef76e0c76de SHA512 e9ebe3711e3f678d3632f8e8e645f8be4fb65608aff04aeeb0e1152521bf571bc4d879f136d23bb0aa8bd4c4ec20f294b472cf54dc70916e52d330328aadd357 WHIRLPOOL 6138271f72fd96fabe3cffc07a6efcb9c0e195ed96f4ad708d00e85e0a84a03900dc41389cd4f26d533a3aa42142a9e17708d7b87d722f1c9348f61a5db3e59d
DIST xen-4.2.2.tar.gz 15602746 SHA256 c9bfe91a5e72f8545acebad9889d64368020359bfe18044c0e683133e55ae005 SHA512 4943b18016ed8c2b194a3b55e6655b3b734b39ffb8cb7ee0a0580f2f4460a1d0e92e1de8ac23f5186272914fad1650586af51fd7c3644d0310eb16f2e11c5e80 WHIRLPOOL 519eb87cb2da694696cbc3e72070a0a3bdb07c46fa266d855d8379eec3a92adfa4d434af3ac01c37834ce4a9174081a6c40030b185a70902329b185cb8d0bbea
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.3.1.tar.gz 16429423 SHA256 3b5b7cc508b1739753585b5c25635471cdcef680e8770a78bf6ef9333d26a9fd SHA512 f5250ad5ad3defc5dc1207eb6208a3928128ef57ac4162018bd92b750dc1df1eaaf37835528aca33a0f9e04c82d5f8c4ba79c03a1780d2b72cbb90cc26f77275 WHIRLPOOL 087390786cea9aee273a5d81988436303991aa5ea92faf111d3b619517368f8c8feef84f4f8c602cac723980a344eb90414887db4ca88a2ee14bc6b0253e36ca

@ -0,0 +1,27 @@
From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Wed, 22 Jan 2014 17:47:21 +0000
Subject: libxc: Fix out-of-memory error handling in xc_cpupool_getinfo()
Avoid freeing info then returning it to the caller.
This is XSA-88.
Coverity-ID: 1056192
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
---
tools/libxc/xc_cpupool.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/libxc/xc_cpupool.c b/tools/libxc/xc_cpupool.c
index c8c2a33..6393cfb 100644
--- a/tools/libxc/xc_cpupool.c
+++ b/tools/libxc/xc_cpupool.c
@@ -104,6 +104,7 @@ xc_cpupoolinfo_t *xc_cpupool_getinfo(xc_interface *xch,
info->cpumap = xc_cpumap_alloc(xch);
if (!info->cpumap) {
free(info);
+ info = NULL;
goto out;
}
info->cpupool_id = sysctl.u.cpupool_op.cpupool_id;

@ -0,0 +1,48 @@
diff --git a/tools/qemu-xen/configure b/tools/qemu-xen/configure
index ea2f8f8..9726440 100755
--- a/tools/qemu-xen/configure
+++ b/tools/qemu-xen/configure
@@ -2459,17 +2459,41 @@ fi
##########################################
+# Do we need libm
+cat > $TMPC << EOF
+#include <math.h>
+int main(void) { return isnan(sin(0.0)); }
+EOF
+if compile_prog "" "" ; then
+ :
+elif compile_prog "" "-lm" ; then
+ LIBS="-lm $LIBS"
+ libs_qga="-lm $libs_qga"
+else
+ error_exit "libm check failed"
+fi
+
+##########################################
# Do we need librt
+# uClibc provides 2 versions of clock_gettime(), one with realtime
+# support and one without. This means that the clock_gettime() don't
+# need -lrt. We still need it for timer_create() so we check for this
+# function in addition.
cat > $TMPC <<EOF
#include <signal.h>
#include <time.h>
-int main(void) { clockid_t id; return clock_gettime(id, NULL); }
+int main(void) {
+ timer_create(CLOCK_REALTIME, NULL, NULL);
+ return clock_gettime(CLOCK_REALTIME, NULL);
+}
EOF
if compile_prog "" "" ; then
:
-elif compile_prog "" "-lrt" ; then
+# we need pthread for static linking. use previous pthread test result
+elif compile_prog "" "-lrt $pthread_lib" ; then
LIBS="-lrt $LIBS"
+ libs_qga="-lrt $libs_qga"
fi
if test "$darwin" != "yes" -a "$mingw32" != "yes" -a "$solaris" != yes -a \

@ -1,7 +1,7 @@
#!/sbin/runscript
# 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/files/xenconsoled.initd,v 1.5 2014/01/23 03:38:35 dlan Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xenconsoled.initd,v 1.6 2014/02/13 07:59:09 dlan Exp $
depend() {
need xenstored
@ -11,7 +11,9 @@ depend() {
# bug #498720
shutdown_all_domU() {
# Note: shutdown all domU, including manually started ones
xl shutdown -a -w >/dev/null
local V=$(xl info| awk "/xen_minor/ { print \$3 }")
# 4.2.2 do not support "-a" option
[ $V -gt 2 ] && xl shutdown -a -w >/dev/null
}
start() {

@ -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.2.2-r6.ebuild,v 1.1 2014/02/07 02:14:50 idella4 Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.2-r7.ebuild,v 1.1 2014/02/13 07:59:09 dlan Exp $
EAPI=5
@ -39,6 +39,7 @@ REQUIRED_USE="hvm? ( qemu )
${PYTHON_REQUIRED_USE}"
DEPEND="dev-libs/lzo:2
dev-libs/glib:2
dev-libs/yajl
dev-libs/libgcrypt
dev-python/lxml[${PYTHON_USEDEP}]
@ -86,6 +87,35 @@ QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
RESTRICT="test"
XSA_PATCHES=(
"${FILESDIR}"/xen-4-CVE-2012-6075-XSA-41.patch
"${FILESDIR}"/xen-4-CVE-2013-1922-XSA-48.patch
"${FILESDIR}"/xen-4-CVE-2013-1952-XSA-49.patch
"${FILESDIR}"/xen-4.2-CVE-2013-1-XSA-55.patch
"${FILESDIR}"/xen-4.2-CVE-2013-2-XSA-55.patch
"${FILESDIR}"/xen-4.2-CVE-2013-3-XSA-55.patch
"${FILESDIR}"/xen-4.2-CVE-2013-4-XSA-55.patch
"${FILESDIR}"/xen-4.2-CVE-2013-5to7-XSA-55.patch
"${WORKDIR}"/files/xen-4.2-CVE-2013-8-XSA-55.patch
"${FILESDIR}"/xen-4.2-CVE-2013-9to10-XSA-55.patch
"${WORKDIR}"/files/xen-4.2-CVE-2013-11-XSA-55.patch
"${FILESDIR}"/xen-4.2-CVE-2013-12to13-XSA-55.patch
"${FILESDIR}"/xen-4.2-CVE-2013-14-XSA-55.patch
"${WORKDIR}"/files/xen-4.2-CVE-2013-15-XSA-55.patch
"${FILESDIR}"/xen-4.2-CVE-2013-16-XSA-55.patch
"${FILESDIR}"/xen-4.2-CVE-2013-17-XSA-55.patch
"${FILESDIR}"/xen-4.2-CVE-2013-18to19-XSA-55.patch
"${FILESDIR}"/xen-4.2-CVE-2013-20to23-XSA-55.patch
"${FILESDIR}"/xen-4-CVE-2013-2072-XSA-56.patch
"${FILESDIR}"/xen-4.2-CVE-XSA-57.patch
"${FILESDIR}"/${PN}-4-CVE-2013-4369-XSA-68.patch
"${FILESDIR}"/${PN}-4-CVE-2013-4370-XSA-69.patch
"${FILESDIR}"/${PN}-4-CVE-2013-4371-XSA-70.patch
"${FILESDIR}"/${PN}-4-CVE-2013-4416-XSA-72.patch
"${FILESDIR}"/${PN/-tools/}-4-CVE-XSA-86.patch #bug #500530
"${FILESDIR}"/${PN}-4-CVE-2014-1950-XSA-88.patch #bug #501080
)
pkg_setup() {
python-single-r1_pkg_setup
export "CONFIG_LOMOUNT=y"
@ -202,34 +232,11 @@ src_prepare() {
# Set dom0-min-mem to kb; Bug #472982
epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch
# Bug #
# Bug 463840
epatch "${FILESDIR}"/${P}-install.patch
epatch "${FILESDIR}"/${P}-rt-link.patch
#Security patches, currently valid
epatch "${FILESDIR}"/xen-4-CVE-2012-6075-XSA-41.patch \
"${FILESDIR}"/xen-4-CVE-2013-1922-XSA-48.patch \
"${FILESDIR}"/xen-4-CVE-2013-1952-XSA-49.patch \
"${FILESDIR}"/xen-4.2-CVE-2013-1-XSA-55.patch \
"${FILESDIR}"/xen-4.2-CVE-2013-2-XSA-55.patch \
"${FILESDIR}"/xen-4.2-CVE-2013-3-XSA-55.patch \
"${FILESDIR}"/xen-4.2-CVE-2013-4-XSA-55.patch \
"${FILESDIR}"/xen-4.2-CVE-2013-5to7-XSA-55.patch \
"${WORKDIR}"/files/xen-4.2-CVE-2013-8-XSA-55.patch \
"${FILESDIR}"/xen-4.2-CVE-2013-9to10-XSA-55.patch \
"${WORKDIR}"/files/xen-4.2-CVE-2013-11-XSA-55.patch \
"${FILESDIR}"/xen-4.2-CVE-2013-12to13-XSA-55.patch \
"${FILESDIR}"/xen-4.2-CVE-2013-14-XSA-55.patch \
"${WORKDIR}"/files/xen-4.2-CVE-2013-15-XSA-55.patch \
"${FILESDIR}"/xen-4.2-CVE-2013-16-XSA-55.patch \
"${FILESDIR}"/xen-4.2-CVE-2013-17-XSA-55.patch \
"${FILESDIR}"/xen-4.2-CVE-2013-18to19-XSA-55.patch \
"${FILESDIR}"/xen-4.2-CVE-2013-20to23-XSA-55.patch \
"${FILESDIR}"/xen-4-CVE-2013-2072-XSA-56.patch \
"${FILESDIR}"/xen-4.2-CVE-XSA-57.patch \
"${FILESDIR}"/${PN}-4-CVE-2013-4369-XSA-68.patch \
"${FILESDIR}"/${PN}-4-CVE-2013-4370-XSA-69.patch \
"${FILESDIR}"/${PN}-4-CVE-2013-4371-XSA-70.patch \
"${FILESDIR}"/${PN}-4-CVE-2013-4416-XSA-72.patch
[[ ${XSA_PATCHES[@]} ]] && epatch "${XSA_PATCHES[@]}"
# Bug 472438
sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \

@ -0,0 +1,406 @@
# 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.3.ebuild,v 1.1 2014/02/14 10:17:46 dlan Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
PYTHON_REQ_USE='xml,threads'
IPXE_TARBALL_URL="http://dev.gentoo.org/~idella4/tarballs/ipxe.tar.gz"
XEN_SEABIOS_URL="http://dev.gentoo.org/~idella4/tarballs/seabios-0-20121121.tar.bz2"
XSAPATCHES="http://dev.gentoo.org/~idella4/"
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} ]] && \
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/${PV}/xen-${PV}.tar.gz
$IPXE_TARBALL_URL
$XEN_SEABIOS_URL
${UPSTRAM_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
dev-python/lxml[${PYTHON_USEDEP}]
dev-python/pypam[${PYTHON_USEDEP}]
sys-libs/zlib
sys-power/iasl
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; 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"
# Prevent the downloading of ipxe, seabios
epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-anti-download.patch
cp "${DISTDIR}"/ipxe.tar.gz tools/firmware/etherboot/ || die
mv ../seabios-dir-remote tools/firmware/ || die
pushd tools/firmware/ > /dev/null
ln -s seabios-dir-remote seabios-dir || die
popd > /dev/null
# 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 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
# Bug 379537
epatch "${FILESDIR}"/fix-gold-ld.patch
# 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
}

@ -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-r4.ebuild,v 1.1 2014/02/08 08:13:43 idella4 Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.1-r5.ebuild,v 1.1 2014/02/13 07:59:09 dlan Exp $
EAPI=5
@ -42,6 +42,7 @@ REQUIRED_USE="hvm? ( qemu )
pygrub? ( python )"
DEPEND="dev-libs/lzo:2
dev-libs/glib:2
dev-libs/yajl
dev-libs/libgcrypt
dev-python/lxml[${PYTHON_USEDEP}]
@ -90,6 +91,13 @@ QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
RESTRICT="test"
# Security patches
XSA_PATCHES=(
"${FILESDIR}"/${PN/-tools/}-4-CVE-2012-6075-XSA-41.patch
"${FILESDIR}"/${PN/-tools/}-4-CVE-XSA-86.patch #bug #500530
"${FILESDIR}"/${PN}-4-CVE-2014-1950-XSA-88.patch #bug #501080
)
pkg_setup() {
python-single-r1_pkg_setup
export "CONFIG_LOMOUNT=y"
@ -206,9 +214,7 @@ src_prepare() {
# Set dom0-min-mem to kb; Bug #472982
epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch
#Security patches, currently valid, bug #500530
epatch "${FILESDIR}"/${PN/-tools/}-4-CVE-2012-6075-XSA-41.patch \
"${FILESDIR}"/${PN/-tools/}-4-CVE-XSA-86.patch
[[ ${XSA_PATCHES[@]} ]] && epatch "${XSA_PATCHES[@]}"
# Bug 472438
sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \

@ -1,2 +1,4 @@
DIST xen-4.2.2.tar.gz 15602746 SHA256 c9bfe91a5e72f8545acebad9889d64368020359bfe18044c0e683133e55ae005 SHA512 4943b18016ed8c2b194a3b55e6655b3b734b39ffb8cb7ee0a0580f2f4460a1d0e92e1de8ac23f5186272914fad1650586af51fd7c3644d0310eb16f2e11c5e80 WHIRLPOOL 519eb87cb2da694696cbc3e72070a0a3bdb07c46fa266d855d8379eec3a92adfa4d434af3ac01c37834ce4a9174081a6c40030b185a70902329b185cb8d0bbea
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.3.1.tar.gz 16429423 SHA256 3b5b7cc508b1739753585b5c25635471cdcef680e8770a78bf6ef9333d26a9fd SHA512 f5250ad5ad3defc5dc1207eb6208a3928128ef57ac4162018bd92b750dc1df1eaaf37835528aca33a0f9e04c82d5f8c4ba79c03a1780d2b72cbb90cc26f77275 WHIRLPOOL 087390786cea9aee273a5d81988436303991aa5ea92faf111d3b619517368f8c8feef84f4f8c602cac723980a344eb90414887db4ca88a2ee14bc6b0253e36ca

@ -0,0 +1,154 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.3.ebuild,v 1.1 2014/02/14 10:15:39 dlan Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
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} ]] && \
UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
[[ -n ${GENTOO_VER} ]] && \
GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
${UPSTRAM_PATCHSET_URI}
${GENTOO_PATCHSET_URI}"
fi
inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
DESCRIPTION="The Xen virtual machine monitor"
HOMEPAGE="http://xen.org/"
LICENSE="GPL-2"
SLOT="0"
IUSE="custom-cflags debug efi flask pae xsm"
DEPEND="${PYTHON_DEPS}
efi? ( >=sys-devel/binutils-2.22[multitarget] )
!efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
RDEPEND=""
PDEPEND="~app-emulation/xen-tools-${PV}"
RESTRICT="test"
# Approved by QA team in bug #144032
QA_WX_LOAD="boot/xen-syms-${PV}"
REQUIRED_USE="
flask? ( xsm )
"
pkg_setup() {
python-any-r1_pkg_setup
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
if use flask ; then
export "XSM_ENABLE=y"
export "FLASK_ENABLE=y"
elif use xsm ; then
export "XSM_ENABLE=y"
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 and fix gcc-4.6
epatch "${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch
if use efi; then
epatch "${FILESDIR}"/${PN}-4.2-efi.patch
export EFI_VENDOR="gentoo"
export EFI_MOUNTPOINT="boot"
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 custom-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
# not strictly necessary to fix this
sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
epatch_user
}
src_configure() {
use debug && myopt="${myopt} debug=y"
use pae && myopt="${myopt} pae=y"
if use custom-cflags; then
filter-flags -fPIE -fstack-protector
replace-flags -O3 -O2
else
unset CFLAGS
fi
}
src_compile() {
# Send raw LDFLAGS so that --as-needed works
emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
}
src_install() {
local myopt
use debug && myopt="${myopt} debug=y"
use pae && myopt="${myopt} pae=y"
# The 'make install' doesn't 'mkdir -p' the subdirs
if use efi; then
mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
fi
emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
}
pkg_postinst() {
elog "Official Xen Guide and the unoffical wiki page:"
elog " http://www.gentoo.org/doc/en/xen-guide.xml"
elog " http://en.gentoo-wiki.com/wiki/Xen/"
use pae && ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
use efi && einfo "The efi executable is installed in boot/efi/gentoo"
}

@ -1,3 +1,4 @@
DIST byobu_5.69.orig.tar.gz 635271 SHA256 ac380555b3760982ef91fc840f44f5363515e390ef3b95f90b31043f1e9d23d0 SHA512 ee69359c7bbbaf5eff503d4a0a3667073a1d3f9debf8fa6daed54af92afc2c1e46acbd538c5e1467c8e0a5a8aa5479ac4d4032936ef0f624e0f77cd59d4d9226 WHIRLPOOL eeee99691bb00fbb333cc7828c018d0d43049d606d7a4e952545bd39cc56eb068e6ad394e9a98cf10211566f3ae0171d072dca9dc532eeff624d7dfdf8157918
DIST byobu_5.70.orig.tar.gz 635429 SHA256 40668fef1fe5cbafaf6b73470cd175976ae50e2802d193918477307c201617f0 SHA512 5d6bba4dc6a01ba758619ba37defcfc371fb84ecba4fce7db98a0ffd88304649a40c2de844dc26cab1aabfc588f749a46ccb71707c3c8314454dbff65749c70d WHIRLPOOL fc12b82f605d4d8459c2b743856898942e86c9f311e3d176ada3975b5a3c9815297002ac58e42e80ba4fe3b723151d4782a8a53937f954e941e52fb4b3c9e1dd
DIST byobu_5.71.orig.tar.gz 635621 SHA256 031fff3858f336fc5e29e98c2dcf3edd42804c025cb751de2c9847cd59c7acff SHA512 37edeaf13dbe43b9beae06f72d7b072f2755644c693793cc5d1737329356887ad1b594d0e09f590da9b6547ab76a3e6c6c0c09d63f6437fb891588efea08875d WHIRLPOOL ae961ef2c01c44275fed1d18c195bbecdd20c257654d0fd5a58e44a5f883d8c24c79158ff60b8ccd870bb8fc6da2a8f884b767bd5ec5b12747422a8e98475289
DIST byobu_5.72.orig.tar.gz 635637 SHA256 185d192f2a95bf2b2ee5bfa52452df52eb31f8c23df27edbd24e5788fad3d069 SHA512 b427f71950b761c0bc416260304f3f1ea8c5399d39d38746934bd605bde449a284f24a9dd877d8b4188c6b21fa27798f26d3860012eeae759dee8ebc557687eb WHIRLPOOL f6a9e9e4aaf939b9bcd0b3044be1ddb07d2259602aabb2f99dea18d0b49d4d814109b0e9006e2cb4bc440889cbeb01784a80d1239d5263347ffecf0a4c9e91f5

@ -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/app-misc/byobu/byobu-5.72.ebuild,v 1.1 2014/02/13 08:55:19 radhermit Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
inherit python-single-r1
DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
HOMEPAGE="http://byobu.co"
SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="screen"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
dev-libs/newt[${PYTHON_USEDEP}]
screen? ( app-misc/screen )
!screen? ( app-misc/tmux )"
src_prepare() {
python_fix_shebang .
# Set default system backend to screen
if use screen ; then
sed -i -e 's/#\(BYOBU_BACKEND\).*/\1="screen"/' etc/byobu/backend || die
fi
}
src_install() {
default
# Create symlinks for backends
dosym ${PN} /usr/bin/${PN}-screen
dosym ${PN} /usr/bin/${PN}-tmux
docompress -x /usr/share/doc/${PN}
}

@ -1,4 +1 @@
DIST esearch-1.0.tar.gz 18071 SHA256 456ece57d9b55e8d9c70920904770c858701d56b7fbb56af32536a5fdd3c8832 SHA512 a75751ce47101b3837c4b50842884568c179dff6915ddaa438d9047361d57babec3229cc84615c0805002344ecc7e9ecf4eee705c65ed2dd4cbc9bbc0cc127b6 WHIRLPOOL 8244eddbf2599f9f8eca5fc1bc1d000d3198331b2aabd542efcc149b9b5629b2c13f2a657c10cb20f72c2aeb3b8ef7fe24b705d6da7ad8c0191f944bd5321f95
DIST esearch-1.1.tar.gz 18855 SHA256 2c9234d9ecdbe1460a58140fd0c25cf6b7fe2e894e2f880dd26c6d03dca7be16 SHA512 0baceabc303e430ee3e69e5c4d7e60a358e3104f5c9d465d9754e48808f5305b510047cee118b93b40f5a88c6644b0367961b997dbf6ca8ffadb758f8567db59 WHIRLPOOL 8e087b6851c3790a1c682a16b8ff5faed5b5cce3813857d250aa0ce66b43a7bfc975c37c4f0b2724d0712e5a7ba86fb77181c20079a5463501fe107f990b7004
DIST esearch-1.2.tar.gz 19319 SHA256 961c3251d8a84983b29a5359f895f86c1457bf066be620390d12e54bd01de769 SHA512 1ec80dd20fe07a61f6476f4161a17740054a088dfe8712dda04735a81a2de4ae5bd5cf7ccbd40f1c84bed5f24bcd3f702162649c771dcc7d4a502d8ed8df1f47 WHIRLPOOL 9ce35c5e617b98b831cd55d8603b3c5dde819dd83956258121720c90e53c429011a464cb887f1e29b0ae253932b4403934f8efde4784ea6fd4a46b7b0a843e8d
DIST esearch-1.3.tar.gz 19383 SHA256 3274c2da21d86287fa27fd562aa63ce82dd813e4d1ebb9c44bd2b82c9ed323f7 SHA512 7fbc1c362a320a76a40c45ddf83a29223eaafd3cfed1d8a9410a380e2025fb515eea26e38ebf0f304d14230c6c5cfc83ef2116b774b1d50ee4f7f4bb0ac046c4 WHIRLPOOL e1caa3f0b09925841899422d98b6222ccde68993d2e24b24034d3bac63e75cc07445513d418fbde99f23ed9d72203bbfe8cbc0861028648ace0c53ec683e6ad3

@ -1,62 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/esearch-1.0-r2.ebuild,v 1.8 2012/03/02 20:26:34 ranger Exp $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="2.[45] 2.7-pypy-* *-jython"
PYTHON_USE_WITH="readline"
PYTHON_NONVERSIONED_EXECUTABLES=(".*")
inherit base distutils python
DESCRIPTION="Replacement for 'emerge --search' with search-index"
HOMEPAGE="http://david-peter.de/esearch.html"
SRC_URI="mirror://github/fuzzyray/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
IUSE="linguas_fr linguas_it"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
DEPEND="sys-apps/portage"
RDEPEND="${DEPEND}"
PATCHES=("${FILESDIR}"/${PV}-fix-EPREFIX-capability.patch
"${FILESDIR}"/${PV}-fix-portage-eprefix-compatibility.patch )
distutils_src_compile_pre_hook() {
echo VERSION="${PVR}" "$(PYTHON)" setup.py set_version
VERSION="${PVR}" "$(PYTHON)" setup.py set_version \
|| die "setup.py set_version failed"
}
src_prepare() {
base_src_prepare
distutils_src_prepare
}
src_compile() {
distutils_src_compile
}
src_install() {
python_convert_shebangs -r "" build-*/scripts-*
distutils_src_install
dodoc eupdatedb.cron || die "dodoc failed"
# Remove unused man pages according to the linguas flags
if ! use linguas_fr ; then
rm -rf "${ED}"/usr/share/man/fr
fi
if ! use linguas_it ; then
rm -rf "${ED}"/usr/share/man/it
fi
}
pkg_postinst() {
distutils_pkg_postinst
ewarn "Because file locations have changed, please run 'hash -r' in your active shells."
}

@ -1,60 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/esearch-1.1-r2.ebuild,v 1.8 2012/07/01 16:44:56 armin76 Exp $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="2.[45] 2.7-pypy-* *-jython"
PYTHON_USE_WITH="readline"
PYTHON_NONVERSIONED_EXECUTABLES=(".*")
inherit base distutils python
DESCRIPTION="Replacement for 'emerge --search' with search-index"
HOMEPAGE="http://david-peter.de/esearch.html"
SRC_URI="mirror://github/fuzzyray/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
IUSE="linguas_fr linguas_it"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
DEPEND="sys-apps/portage"
RDEPEND="${DEPEND}"
# Populate the patches array for any patches for -rX releases
# It is an array of patch file names of the form:
# "${FILESDIR}"/${PV}-fix-EPREFIX-capability.patch
PATCHES=( "${FILESDIR}"/${PV}-Reprint-warnings-detected-during-layman-sync-API.patch
"${FILESDIR}"/${PV}-Use-of-undefined-variable-in-sync.patch )
distutils_src_compile_pre_hook() {
echo VERSION="${PVR}" "$(PYTHON)" setup.py set_version
VERSION="${PVR}" "$(PYTHON)" setup.py set_version \
|| die "setup.py set_version failed"
}
src_prepare() {
base_src_prepare
distutils_src_prepare
}
src_compile() {
distutils_src_compile
}
src_install() {
python_convert_shebangs -r "" build-*/scripts-*
distutils_src_install
dodoc eupdatedb.cron || die "dodoc failed"
# Remove unused man pages according to the linguas flags
if ! use linguas_fr ; then
rm -rf "${ED}"/usr/share/man/fr
fi
if ! use linguas_it ; then
rm -rf "${ED}"/usr/share/man/it
fi
}

@ -1,59 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/esearch-1.2.ebuild,v 1.1 2012/06/04 21:20:28 fuzzyray Exp $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="2.[45] 2.7-pypy-* *-jython"
PYTHON_USE_WITH="readline"
PYTHON_NONVERSIONED_EXECUTABLES=(".*")
inherit base distutils python
DESCRIPTION="Replacement for 'emerge --search' with search-index"
HOMEPAGE="http://david-peter.de/esearch.html"
SRC_URI="mirror://github/fuzzyray/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
IUSE="linguas_fr linguas_it"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
DEPEND="sys-apps/portage"
RDEPEND="${DEPEND}"
# Populate the patches array for any patches for -rX releases
# It is an array of patch file names of the form:
# "${FILESDIR}"/${PV}-fix-EPREFIX-capability.patch
PATCHES=()
distutils_src_compile_pre_hook() {
echo VERSION="${PVR}" "$(PYTHON)" setup.py set_version
VERSION="${PVR}" "$(PYTHON)" setup.py set_version \
|| die "setup.py set_version failed"
}
src_prepare() {
base_src_prepare
distutils_src_prepare
}
src_compile() {
distutils_src_compile
}
src_install() {
python_convert_shebangs -r "" build-*/scripts-*
distutils_src_install
dodoc eupdatedb.cron || die "dodoc failed"
# Remove unused man pages according to the linguas flags
if ! use linguas_fr ; then
rm -rf "${ED}"/usr/share/man/fr
fi
if ! use linguas_it ; then
rm -rf "${ED}"/usr/share/man/it
fi
}

@ -0,0 +1,54 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/esearch-1.3-r1.ebuild,v 1.1 2014/02/13 20:28:18 fuzzyray Exp $
EAPI="5"
PYTHON_COMPAT=(python{2_6,2_7,3_2,3_3})
PYTHON_REQ_USE="readline(+)"
inherit distutils-r1
DESCRIPTION="Replacement for 'emerge --search' with search-index"
HOMEPAGE="http://david-peter.de/esearch.html"
SRC_URI="mirror://github/fuzzyray/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
IUSE="linguas_fr linguas_it"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
DEPEND="sys-apps/portage"
RDEPEND="${DEPEND}"
# Populate the patches array for any patches for -rX releases
# It is an array of patch file names of the form:
# "${FILESDIR}"/${PV}-fix-EPREFIX-capability.patch
PATCHES=(
"${FILESDIR}"/${PV}-Fix-setup.py.patch
"${FILESDIR}"/${PV}-Fix-python-3-compatability.patch
)
python_prepare_all() {
python_export_best
echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
VERSION="${PVR}" "${PYTHON}" setup.py set_version \
|| die "setup.py set_version failed"
distutils-r1_python_prepare_all
}
python_install_all() {
distutils-r1_python_install_all
dodoc eupdatedb.cron || die "dodoc failed"
# Remove unused man pages according to the linguas flags
if ! use linguas_fr ; then
rm -rf "${ED}"/usr/share/man/fr \
|| die "rm failed to remove ${ED}/usr/share/man/fr"
fi
if ! use linguas_it ; then
rm -rf "${ED}"/usr/share/man/it \
|| die "rm failed to remove ${ED}/usr/share/man/it"
fi
}

@ -1,14 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/esearch-9999.ebuild,v 1.5 2012/12/11 08:17:36 fuzzyray Exp $
# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/esearch-9999.ebuild,v 1.6 2014/02/13 20:28:18 fuzzyray Exp $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="2.[45] *-jython 2.7-pypy-*"
PYTHON_USE_WITH="readline"
PYTHON_NONVERSIONED_EXECUTABLES=(".*")
EAPI="5"
PYTHON_COMPAT=(python{2_6,2_7,3_2,3_3})
PYTHON_REQ_USE="readline(+)"
inherit distutils python git-2
inherit distutils-r1 git-2
EGIT_REPO_URI="git://github.com/fuzzyray/esearch.git"
@ -25,18 +23,15 @@ KEYWORDS=""
DEPEND="sys-apps/portage"
RDEPEND="${DEPEND}"
distutils_src_compile_pre_hook() {
echo VERSION="9999-${EGIT_VERSION}" "$(PYTHON)" setup.py set_version
VERSION="9999-${EGIT_VERSION}" "$(PYTHON)" setup.py set_version
python_prepare_all() {
python_export_best
echo VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version
VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version
distutils-r1_python_prepare_all
}
src_compile() {
distutils_src_compile
}
src_install() {
python_convert_shebangs -r "" build-*/scripts-*
distutils_src_install
python_install_all() {
distutils-r1_python_install_all
dodoc eupdatedb.cron || die "dodoc failed"
# Remove unused man pages according to the linguas flags

@ -1,25 +0,0 @@
From 8399831cd2f5968fc45d0f1dc4e131368161e39a Mon Sep 17 00:00:00 2001
From: Brian Dolbec <dolsen@gentoo.org>
Date: Fri, 9 Dec 2011 23:58:52 -0800
Subject: [PATCH] apply zmedico's patch to fix EPREFIX capability.
---
esearch/search.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/esearch/search.py b/esearch/search.py
index 8498687..f296cb7 100755
--- a/esearch/search.py
+++ b/esearch/search.py
@@ -15,7 +15,7 @@ from os import listdir, getenv, system
from os.path import isdir, exists
import re
-sys.path.insert(0, "/usr/lib/portage/pym")
+#sys.path.insert(0, "/usr/lib/portage/pym")
# commented out so it can run from the git checkout
#sys.path.insert(0, "/usr/lib/esearch")
--
1.7.8

@ -1,38 +0,0 @@
From a160eedd0b176cfa3da755762a8e40a38b753114 Mon Sep 17 00:00:00 2001
From: Paul Varner <fuzzyray@gentoo.org>
Date: Mon, 19 Dec 2011 13:09:42 -0600
Subject: [PATCH] Fix setup.py to work with EPREFIX changes in Portage.
---
setup.py | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/setup.py b/setup.py
index 2990e33..b24cd8f 100755
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ cwd = os.getcwd()
try:
from portage.const import EPREFIX
except ImportError:
- EPREFIX='/'
+ EPREFIX=''
# Python files that need `__version__ = ""` subbed, relative to this dir:
python_scripts = [os.path.join(cwd, path) for path in (
@@ -80,9 +80,9 @@ core.setup(
packages=packages,
scripts=(glob('bin/*')),
data_files=(
- (os.path.join(EPREFIX, 'usr/share/man/man1'), glob('man/en/*')),
- (os.path.join(EPREFIX, 'usr/share/man/fr/man1'), glob('man/fr/*')),
- (os.path.join(EPREFIX, 'usr/share/man/it/man1'), glob('man/it/*')),
+ (os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'usr/share/man/man1'), glob('man/en/*')),
+ (os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'usr/share/man/fr/man1'), glob('man/fr/*')),
+ (os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'usr/share/man/it/man1'), glob('man/it/*')),
),
cmdclass={
'set_version': set_version,
--
1.7.8

@ -1,100 +0,0 @@
From 32797b3ac5992c1711f9d965a967d00cbe014c78 Mon Sep 17 00:00:00 2001
From: Brian Dolbec <dolsen@gentoo.org>
Date: Sun, 15 Apr 2012 16:12:51 -0700
Subject: [PATCH] Reprint warnings detected during layman sync API operations
at the end of the sync output.
---
esearch/common.py | 8 +++++++-
esearch/sync.py | 17 ++++++++++++-----
2 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/esearch/common.py b/esearch/common.py
index c092026..a97102f 100755
--- a/esearch/common.py
+++ b/esearch/common.py
@@ -10,7 +10,7 @@ from __future__ import print_function
import sys
from portage import catpkgsplit
-from portage.output import red, green
+from portage.output import red, green, yellow
from . import __version__
@@ -101,3 +101,9 @@ def error(msg, fatal=True, stderr=CONFIG['stderr']):
print('', file=stderr)
if fatal:
sys.exit(1)
+
+def warn(msg, fatal=False, stdout=CONFIG['stdout']):
+ print(yellow(" * Warning:"), msg, file=stdout)
+ print('', file=stdout)
+ if fatal:
+ sys.exit(1)
diff --git a/esearch/sync.py b/esearch/sync.py
index a05f1cf..5748698 100755
--- a/esearch/sync.py
+++ b/esearch/sync.py
@@ -29,7 +29,7 @@ except ImportError:
from esearch.common import (CONFIG, SyncOpts, error, outofdateerror,
logfile_sync, laymanlog_sync, tmp_path, tmp_prefix, version,
- EPREFIX, COMPACT)
+ EPREFIX, COMPACT, warn)
from esearch.update import updatedb
from esearch.search import searchdb
@@ -166,8 +166,8 @@ def layman_sync(config):
error("'" + config['layman-cmd'] + "' failed, see " +
laymanlog_sync + " for errors", fatal=False)
print("")
- return False
- return True
+ return False, []
+ return True, []
# run the api to sync
emsg("Running the Layman API", config)
if config['verbose']<1:
@@ -179,6 +179,7 @@ def layman_sync(config):
verbose=config['verbose']>0, nocolor=config['nocolor'])
repos = _layman.get_installed()
success = _layman.sync(repos, output_results=config['verbose']>0)
+ warnings = _layman.sync_results[1]
if not success:
error("Syncing with the layman api "\
"failed.\n Failures were:", fatal=False)
@@ -186,7 +187,7 @@ def layman_sync(config):
for ovl, result in fatals:
error(result, fatal=False)
- return success
+ return success, warnings
def sync(config):
@@ -194,7 +195,8 @@ def sync(config):
tree_old = gettree("old", config)
if config['layman-sync']:
- if not layman_sync(config):
+ success, warnings = layman_sync(config)
+ if not success:
return False
if config['verbose'] >= 0:
@@ -266,6 +268,11 @@ def sync(config):
emsg("No updates found", config)
success = True
+ if warnings:
+ print("", file=config['stdout'])
+ for ovl, result in warnings:
+ warn(result)
+
# multiple pkgname search method
# build our re search list
#pkg_patterns = []
--
1.7.8.5

@ -1,28 +0,0 @@
From be82bbc05e3f31d52f45561125e02d764cce7e7f Mon Sep 17 00:00:00 2001
From: gdvl <gdvl@gentp>
Date: Sat, 21 Apr 2012 12:14:03 +0200
Subject: [PATCH] Use of undefined variable in sync()
The variable 'warnings' in sync() is undefined if esync is called
without --layman-sync. This causes esync to fail when executing the
'if warnings ...' statement.
---
esearch/sync.py | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/esearch/sync.py b/esearch/sync.py
index 5748698..a147ac1 100755
--- a/esearch/sync.py
+++ b/esearch/sync.py
@@ -192,6 +192,8 @@ def layman_sync(config):
def sync(config):
+ warnings = None
+
tree_old = gettree("old", config)
if config['layman-sync']:
--
1.7.8.5

@ -0,0 +1,34 @@
From 3978f923ac814aef014cf412b63d11fd94f60692 Mon Sep 17 00:00:00 2001
From: Paul Varner <fuzzyray@gentoo.org>
Date: Wed, 8 May 2013 14:26:48 -0500
Subject: [PATCH 1/2] Fix python 3 compatability with 'esearch -e' (Bug 469076)
Thanks to zmedico for the patch.
---
esearch/search.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/esearch/search.py b/esearch/search.py
index f91f5b1..696a0f0 100755
--- a/esearch/search.py
+++ b/esearch/search.py
@@ -22,6 +22,7 @@ import re
try:
from portage.output import bold, red, green, darkgreen, turquoise, blue, nocolor
from portage import settings, pkgcmp, pkgsplit, portdb, best
+ from portage.util import cmp_sort_key
except ImportError:
print("Critical: portage imports failed!")
sys.exit(1)
@@ -107,7 +108,7 @@ def searchEbuilds(path, portdir=True, searchdef="", repo_num="",
data['defebuild'] = (searchdef, pkgs[-1][3])
if not portdir:
config['found_in_overlay'] = True
- pkgs.sort(mypkgcmp)
+ pkgs.sort(key=cmp_sort_key(mypkgcmp))
for pkg in pkgs:
rev = ""
if pkg[2] != "r0":
--
1.8.5.4

@ -0,0 +1,28 @@
From 94e77b115f5b14b7dfea50e4a7b77047e4b47263 Mon Sep 17 00:00:00 2001
From: Paul Varner <fuzzyray@gentoo.org>
Date: Tue, 18 Dec 2012 04:33:27 -0600
Subject: [PATCH 1/3] Fix setup.py so that either VERSION or PVR will set the
version.
This fixes the issue with egg-info always having a version number of
9999. Fix is from Brian Dolbec courtesy of mirrorselect.
---
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index 9d2addd..45a4c06 100755
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ import io
sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'pym'))
-__version__ = os.getenv('VERSION', default='9999')
+__version__ = os.getenv('VERSION', default=os.getenv('PVR', default='9999'))
cwd = os.getcwd()
--
1.8.5.4

@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r2.ebuild,v 1.1 2014/02/09 20:39:59 tgurr Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r2.ebuild,v 1.2 2014/02/13 16:01:48 jer Exp $
EAPI=5
@ -19,7 +19,7 @@ SRC_URI="
LICENSE="AGPL-3 CPL-1.0"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="bindist cups dbus djvu gtk idn linguas_de static-libs X"
COMMON_DEPEND="

@ -0,0 +1,221 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r3.ebuild,v 1.1 2014/02/12 19:22:04 tgurr Exp $
EAPI=5
inherit autotools eutils multilib versionator flag-o-matic
DESCRIPTION="Ghostscript is an interpreter for the PostScript language and for PDF"
HOMEPAGE="http://ghostscript.com/"
MY_P=${P/-gpl}
GSDJVU_PV=1.6
PVM=$(get_version_component_range 1-2)
SRC_URI="
mirror://sourceforge/ghostscript/${MY_P}.tar.bz2
mirror://gentoo/${PN}-9.10-patchset-1.tar.bz2
!bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz ) )"
LICENSE="AGPL-3 CPL-1.0"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="bindist cups dbus djvu gtk idn linguas_de static-libs X"
COMMON_DEPEND="
app-text/libpaper
media-libs/fontconfig
>=media-libs/freetype-2.4.9:2=
media-libs/jbig2dec
>=media-libs/lcms-2.5:2
>=media-libs/libpng-1.6.2:0=
>=media-libs/tiff-4.0.1:0=
>=sys-libs/zlib-1.2.7:=
virtual/jpeg:0
!bindist? ( djvu? ( app-text/djvu ) )
cups? ( >=net-print/cups-1.3.8 )
dbus? ( sys-apps/dbus )
gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
idn? ( net-dns/libidn )
X? ( x11-libs/libXt x11-libs/libXext )
"
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
"
RDEPEND="${COMMON_DEPEND}
>=app-text/poppler-data-0.4.5-r1
>=media-fonts/urw-fonts-2.4.9
linguas_ja? ( media-fonts/kochi-substitute )
linguas_ko? ( media-fonts/baekmuk-fonts )
linguas_zh_CN? ( media-fonts/arphicfonts )
linguas_zh_TW? ( media-fonts/arphicfonts )
!!media-fonts/gnu-gs-fonts-std
!!media-fonts/gnu-gs-fonts-other
!<net-print/cups-filters-1.0.36-r2
"
S="${WORKDIR}/${MY_P}"
LANGS="ja ko zh_CN zh_TW"
for X in ${LANGS} ; do
IUSE="${IUSE} linguas_${X}"
done
pkg_setup() {
if use bindist && use djvu; then
ewarn "You have bindist in your USE, djvu support will NOT be compiled!"
ewarn "See http://djvu.sourceforge.net/gsdjvu/COPYING for details on licensing issues."
fi
}
src_prepare() {
# remove internal copies of various libraries
rm -rf "${S}"/cups/libs
rm -rf "${S}"/expat
rm -rf "${S}"/freetype
rm -rf "${S}"/jbig2dec
rm -rf "${S}"/jpeg{,xr}
rm -rf "${S}"/lcms{,2}
rm -rf "${S}"/libpng
rm -rf "${S}"/tiff
rm -rf "${S}"/zlib
# remove internal urw-fonts
rm -rf "${S}"/Resource/Font
# remove internal CMaps (CMaps from poppler-data are used instead)
rm -rf "${S}"/Resource/CMap
# apply various patches, many borrowed from Fedora
# http://pkgs.fedoraproject.org/gitweb/?p=ghostscript.git
EPATCH_SUFFIX="patch" EPATCH_FORCE="yes"
EPATCH_SOURCE="${WORKDIR}/patches/"
epatch
if ! use bindist && use djvu ; then
unpack gsdjvu-${GSDJVU_PV}.tar.gz
cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}"
cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}"/base
epatch "${WORKDIR}"/patches-gsdjvu/gsdjvu-1.3-${PN}-8.64.patch
cp "${S}"/contrib/contrib.mak "${S}"/base/contrib.mak.gsdjvu
grep -q djvusep "${S}"/contrib/contrib.mak || \
cat gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> "${S}"/contrib/contrib.mak
# install ps2utf8.ps, bug #197818
cp gsdjvu-${GSDJVU_PV}/ps2utf8.ps "${S}"/lib
sed -i -e '/$(EXTRA_INIT_FILES)/ a\ps2utf8.ps \\' \
"${S}"/base/unixinst.mak || die "sed failed"
fi
if ! use gtk ; then
sed -i -e "s:\$(GSSOX)::" \
-e "s:.*\$(GSSOX_XENAME)$::" \
"${S}"/base/unix-dll.mak || die "sed failed"
fi
# search path fix
# put LDFLAGS after BINDIR, bug #383447
sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \
-e "s:exdir=.*:exdir=/usr/share/doc/${PF}/examples:" \
-e "s:docdir=.*:docdir=/usr/share/doc/${PF}/html:" \
-e "s:GS_DOCDIR=.*:GS_DOCDIR=/usr/share/doc/${PF}/html:" \
-e 's:-L$(BINDIR):& $(LDFLAGS):g' \
"${S}"/Makefile.in "${S}"/base/*.mak || die "sed failed"
cd "${S}"
eautoreconf
cd "${S}/ijs"
eautoreconf
}
src_configure() {
local FONTPATH
for path in \
/usr/share/fonts/urw-fonts \
/usr/share/fonts/Type1 \
/usr/share/fonts \
/usr/share/poppler/cMap/Adobe-CNS1 \
/usr/share/poppler/cMap/Adobe-GB1 \
/usr/share/poppler/cMap/Adobe-Japan1 \
/usr/share/poppler/cMap/Adobe-Japan2 \
/usr/share/poppler/cMap/Adobe-Korea1
do
FONTPATH="$FONTPATH${FONTPATH:+:}$path"
done
econf \
--enable-dynamic \
--enable-freetype \
--enable-fontconfig \
--enable-openjpeg \
--disable-compile-inits \
--with-drivers=ALL \
--with-fontpath="$FONTPATH" \
--with-ijs \
--with-jbig2dec \
--with-libpaper \
--with-system-libtiff \
--without-lcms \
--without-luratech \
$(use_enable cups) \
$(use_enable dbus) \
$(use_enable gtk) \
$(use_with cups pdftoraster) \
$(use_with idn libidn) \
$(use_with X x)
if ! use bindist && use djvu ; then
sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g' \
"${S}"/Makefile || die "sed failed"
fi
cd "${S}/ijs"
econf \
--enable-shared \
$(use_enable static-libs static)
}
src_compile() {
# workaround: -j1 -> see bug #234378
emake -j1 so all
cd "${S}/ijs"
emake
}
src_install() {
# workaround: -j1 -> see bug #356303
emake -j1 DESTDIR="${D}" install-so install
if ! use bindist && use djvu ; then
dobin gsdjvu
fi
# move gsc to gs, bug #343447
# gsc collides with gambit, bug #253064
mv -f "${D}/usr/bin/gsc" "${D}/usr/bin/gs" || die
cd "${S}/ijs"
emake DESTDIR="${D}" install
# rename the original cidfmap to cidfmap.GS
mv "${D}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die
# install our own cidfmap to handle CJK fonts
insinto "/usr/share/ghostscript/${PVM}/Resource/Init"
doins "${WORKDIR}/fontmaps/CIDFnmap"
doins "${WORKDIR}/fontmaps/cidfmap"
for X in ${LANGS} ; do
if use linguas_${X} ; then
doins "${WORKDIR}/fontmaps/cidfmap.${X}"
fi
done
# install the CMaps from poppler-data properly, bug #409361
dosym /usr/share/poppler/cMaps /usr/share/ghostscript/${PVM}/Resource/CMap
use static-libs || find "${D}" -name '*.la' -delete
use linguas_de || rm -r "${D}"/usr/share/man/de
}

@ -1,3 +1,5 @@
DIST multitail-5.2.12.tgz 163735 SHA256 681d87cd49e11aab1d82ad7818ee639c88a3d305db8accf0859977beda6c493c SHA512 d2ce9c119b619857c22dde098f3013fe8d9c8a410f1f6cc56e97cc2bf3fc19eddeff1485019be16587791f44b0b680431087c9e9be66ecc1c999ea0507b6b99c WHIRLPOOL 73ed263561b066f871aa2193a408f5c22f99261fbf08f7c83f020fc1e2799f67884dd5519cd8adcea07d45ae7a4a98b9d49402f6d14ab54ac9bf78c403c54039
DIST multitail-5.2.13.tgz 164018 SHA256 8692a9d8513093877e337673a8437075dcd34522a0840b2438e5cd1e6a5bafab SHA512 fa8b057e445d845544afb52c0fa314a14dec08e64789e515fe86ebe22875c9626141476ad704ed4208301546c4ac794944165dcfcd8475d79d7d03e1725e5a51 WHIRLPOOL 9bb3a05262ed19e465c59d737d3eff3d07f6a5be71bc7d3b77d9b3f365e915d568da3f9ca1fcc7dc2791767c05807716e6f7c9afd73f37f495f3a3fa748c02e1
DIST multitail-6.0.tgz 163969 SHA256 0daeb62204491fcf76ab5706d13036e05b941a8cdbe8f9eacd1a4cae7a63eb5d SHA512 f6005d341f88e0fdd361ff7a19d77f10d58abaa44e0e0cfbcca1f21b4bc176374bccbea0327c516936310e42d7e1abb7bb84c9853d69a2206fefea306b6c8250 WHIRLPOOL 175a6f393794b0c1da0a75281b463a4151e3108fe7f9103c26087674871590313dfdd76b961fdec9f77c0ff93fe0a2a3aaa1e69fb110895d7e5c243770b56aee
DIST multitail-6.1.tgz 164646 SHA256 69a4266c40d8ccc3387fca31929385d828d1e33fbdb5091781bea3b324174331 SHA512 8bb7223643aea4327d7806bbc1f696824eff671f86771a63e7b28f6bde02e223567690328e4bf552c014d8daa46a121e5af7c4fa70319bc5df7e77be132f30e1 WHIRLPOOL 55903faadf2c2988c3fe6b3d78ccf324541c627597ecfaa89da76f3f0ebd8d5f75b0abdd5a33e6b11af0f9b88fa3b278baa36e4e1cb3d5a1be10bd10eb22683e
DIST multitail-6.2.tgz 166006 SHA256 06fa98421874b3eef55e0e375b6d1ecdf41ddb2c951c25cd9c777ce87076cd1b SHA512 bce3bf7d1b02f72ed9bc66b30a38bf3480b32b8070a58ead5b1d86a63c100abc9e747f716c62825d33f99426daf695863b65791a5a64fb85557eed95852435d2 WHIRLPOOL b3c8328d5fa4ba8a59533e6acc2cf36b1efc3e24c25b25fb7c8d305aaaa20d8354a8befda1dab19f13218701fb20a6a8cab034d6e0f5b200a01380c929bb0d46

@ -0,0 +1,57 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/multitail/multitail-6.1.ebuild,v 1.1 2014/02/13 07:59:26 jlec Exp $
EAPI=5
inherit eutils flag-o-matic toolchain-funcs
DESCRIPTION="Tail with multiple windows"
HOMEPAGE="http://www.vanheusden.com/multitail/"
SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
IUSE="debug examples unicode"
RDEPEND="sys-libs/ncurses[unicode?]"
DEPEND="${RDEPEND}
virtual/pkgconfig"
RESTRICT="test" # bug #492270
src_prepare() {
epatch "${FILESDIR}"/${PN}-6.0-as-needed.patch
use x86-interix && epatch "${FILESDIR}"/${PN}-5.2.6-interix.patch
sed \
-e '/gcc/d' \
-e '/scan-build/d' \
-e 's:make clean::g' \
-e "/^DESTDIR/s:=.*$:=${EROOT}:g" \
-i Makefile || die
tc-export CC PKG_CONFIG
use debug && append-flags "-D_DEBUG"
}
src_configure() {
emake UTF8_SUPPORT=$(usex unicode)
}
src_install () {
dobin multitail
insinto /etc
doins multitail.conf
dodoc Changes readme.txt thanks.txt
doman multitail.1
dohtml manual.html
docinto examples
use examples && dodoc colors-example.{pl,sh} convert-{geoip,simple}.pl
}

@ -0,0 +1,57 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/multitail/multitail-6.2.ebuild,v 1.1 2014/02/14 07:11:51 jlec Exp $
EAPI=5
inherit eutils flag-o-matic toolchain-funcs
DESCRIPTION="Tail with multiple windows"
HOMEPAGE="http://www.vanheusden.com/multitail/"
SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
IUSE="debug examples unicode"
RDEPEND="sys-libs/ncurses[unicode?]"
DEPEND="${RDEPEND}
virtual/pkgconfig"
RESTRICT="test" # bug #492270
src_prepare() {
epatch "${FILESDIR}"/${PN}-6.0-as-needed.patch
use x86-interix && epatch "${FILESDIR}"/${PN}-5.2.6-interix.patch
sed \
-e '/gcc/d' \
-e '/scan-build/d' \
-e 's:make clean::g' \
-e "/^DESTDIR/s:=.*$:=${EROOT}:g" \
-i Makefile || die
tc-export CC PKG_CONFIG
use debug && append-flags "-D_DEBUG"
}
src_configure() {
emake UTF8_SUPPORT=$(usex unicode)
}
src_install () {
dobin multitail
insinto /etc
doins multitail.conf
dodoc Changes readme.txt thanks.txt
doman multitail.1
dohtml manual.html
docinto examples
use examples && dodoc colors-example.{pl,sh} convert-{geoip,simple}.pl
}

@ -1,8 +1,7 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6858e70..3bddcf2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -421,6 +421,7 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Version.in"
diff -ruN OpenSceneGraph-3.0.1/CMakeLists.txt new/CMakeLists.txt
--- OpenSceneGraph-3.0.1/CMakeLists.txt 2011-07-31 09:50:34.000000000 +0200
+++ new/CMakeLists.txt 2014-02-11 23:12:54.360448879 +0100
@@ -421,6 +421,7 @@
# INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}")
@ -10,7 +9,7 @@ index 6858e70..3bddcf2 100644
################################################################################
# Set Version Info resource file
@@ -450,30 +451,30 @@ IF(ANDROID)
@@ -450,30 +451,30 @@
ANDROID_3RD_PARTY()
ELSE()
# Common to all platforms except android:
@ -63,7 +62,7 @@ index 6858e70..3bddcf2 100644
ENDIF()
# Include macro utilities here
@@ -485,17 +486,17 @@ IF(NOT ANDROID)
@@ -485,17 +486,17 @@
IF (DESIRED_QT_VERSION)
IF (DESIRED_QT_VERSION MATCHES 4)
@ -85,7 +84,7 @@ index 6858e70..3bddcf2 100644
ENDIF()
ENDIF()
@@ -504,12 +506,12 @@ ENDIF(NOT ANDROID)
@@ -504,12 +505,12 @@
IF (BUILD_OSG_EXAMPLES AND NOT ANDROID)
@ -102,7 +101,7 @@ index 6858e70..3bddcf2 100644
ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
@@ -530,10 +532,10 @@ ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
@@ -530,10 +531,10 @@
# can use Quicktime.
IF(NOT ANDROID)
IF(NOT APPLE)
@ -117,7 +116,24 @@ index 6858e70..3bddcf2 100644
# QuickTime is required for OS X, but optional for Windows.
IF(WIN32)
@@ -884,7 +886,7 @@ IF(BUILD_DOCUMENTATION)
@@ -586,15 +587,7 @@
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
ENDIF()
-IF(UNIX AND NOT WIN32 AND NOT APPLE)
- IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
- SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement")
- MARK_AS_ADVANCED(LIB_POSTFIX)
- ENDIF()
-ENDIF()
-IF(NOT DEFINED LIB_POSTFIX)
- SET(LIB_POSTFIX "")
-ENDIF()
+SET(LIB_POSTFIX ${LIB_SUFFIX})
# Here we apparantly do some funky stuff with making the bin/ and lib/
# folders which is probably needed to work around a very old CMake bug?
@@ -884,7 +877,7 @@
${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
)
#INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
@ -126,7 +142,7 @@ index 6858e70..3bddcf2 100644
# now set up openthreads documentation generation
IF(BUILD_REF_DOCS_TAGFILE)
@@ -900,7 +902,7 @@ IF(BUILD_DOCUMENTATION)
@@ -900,7 +893,7 @@
${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY
)
#INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
@ -135,11 +151,9 @@ index 6858e70..3bddcf2 100644
# Process our other doxyfiles but don't create targets for these
CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile
diff --git a/CMakeModules/COPYING-CMAKE-SCRIPTS b/CMakeModules/COPYING-CMAKE-SCRIPTS
new file mode 100644
index 0000000..4b41776
--- /dev/null
+++ b/CMakeModules/COPYING-CMAKE-SCRIPTS
diff -ruN OpenSceneGraph-3.0.1/CMakeModules/COPYING-CMAKE-SCRIPTS new/CMakeModules/COPYING-CMAKE-SCRIPTS
--- OpenSceneGraph-3.0.1/CMakeModules/COPYING-CMAKE-SCRIPTS 1970-01-01 01:00:00.000000000 +0100
+++ new/CMakeModules/COPYING-CMAKE-SCRIPTS 2014-02-11 23:12:31.241449702 +0100
@@ -0,0 +1,22 @@
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
@ -163,11 +177,9 @@ index 0000000..4b41776
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/CMakeModules/FindFLTK.cmake b/CMakeModules/FindFLTK.cmake
deleted file mode 100644
index e376b78..0000000
--- a/CMakeModules/FindFLTK.cmake
+++ /dev/null
diff -ruN OpenSceneGraph-3.0.1/CMakeModules/FindFLTK.cmake new/CMakeModules/FindFLTK.cmake
--- OpenSceneGraph-3.0.1/CMakeModules/FindFLTK.cmake 2010-11-11 17:51:46.000000000 +0100
+++ new/CMakeModules/FindFLTK.cmake 1970-01-01 01:00:00.000000000 +0100
@@ -1,52 +0,0 @@
-# Locate FLTK
-# This module defines
@ -221,11 +233,9 @@ index e376b78..0000000
-IF(FLTK_LIBRARY AND FLTK_INCLUDE_DIR)
- SET(FLTK_FOUND "YES")
-ENDIF(FLTK_LIBRARY AND FLTK_INCLUDE_DIR)
diff --git a/CMakeModules/MacroOptionalFindPackage.cmake b/CMakeModules/MacroOptionalFindPackage.cmake
new file mode 100644
index 0000000..f09952f
--- /dev/null
+++ b/CMakeModules/MacroOptionalFindPackage.cmake
diff -ruN OpenSceneGraph-3.0.1/CMakeModules/MacroOptionalFindPackage.cmake new/CMakeModules/MacroOptionalFindPackage.cmake
--- OpenSceneGraph-3.0.1/CMakeModules/MacroOptionalFindPackage.cmake 1970-01-01 01:00:00.000000000 +0100
+++ new/CMakeModules/MacroOptionalFindPackage.cmake 2014-02-11 23:12:31.256449701 +0100
@@ -0,0 +1,28 @@
+# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION()
+# MACRO_OPTIONAL_FIND_PACKAGE( <name> [QUIT] )
@ -255,11 +265,10 @@ index 0000000..f09952f
+ endif (WITH_${_name})
+endmacro (MACRO_OPTIONAL_FIND_PACKAGE)
+
diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake
index aa607fa..8f3771c 100644
--- a/CMakeModules/OsgMacroUtils.cmake
+++ b/CMakeModules/OsgMacroUtils.cmake
@@ -445,9 +445,9 @@ MACRO(SETUP_EXAMPLE EXAMPLE_NAME)
diff -ruN OpenSceneGraph-3.0.1/CMakeModules/OsgMacroUtils.cmake new/CMakeModules/OsgMacroUtils.cmake
--- OpenSceneGraph-3.0.1/CMakeModules/OsgMacroUtils.cmake 2011-04-21 19:16:27.000000000 +0200
+++ new/CMakeModules/OsgMacroUtils.cmake 2014-02-11 23:12:31.280449700 +0100
@@ -445,9 +445,9 @@
SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES FOLDER "Examples")
IF(APPLE)
@ -271,10 +280,9 @@ index aa607fa..8f3771c 100644
ENDIF(APPLE)
ENDMACRO(SETUP_EXAMPLE)
diff --git a/examples/osgviewerFLTK/CMakeLists.txt b/examples/osgviewerFLTK/CMakeLists.txt
index 43c023b..dd177f0 100644
--- a/examples/osgviewerFLTK/CMakeLists.txt
+++ b/examples/osgviewerFLTK/CMakeLists.txt
diff -ruN OpenSceneGraph-3.0.1/examples/osgviewerFLTK/CMakeLists.txt new/examples/osgviewerFLTK/CMakeLists.txt
--- OpenSceneGraph-3.0.1/examples/osgviewerFLTK/CMakeLists.txt 2007-06-25 10:35:06.000000000 +0200
+++ new/examples/osgviewerFLTK/CMakeLists.txt 2014-02-11 23:12:31.331449698 +0100
@@ -1,6 +1,6 @@
SET(TARGET_SRC osgviewerFLTK.cpp )

@ -2,4 +2,5 @@ DIST guava-13.0.1-sources.jar 1060992 SHA256 6968729f41bd225c00ce6c9212674fe5fa6
DIST guava-14.0.1-sources.jar 1170076 SHA256 a41f35daf37667524bf76c33f8d14ff2a2bb8bfb38e876327628f62f7592e53e SHA512 0a495da0fcc460308faa017b4754a3460eeff08cbfcbfa1cb976fccf3cf9a0fb191e1b88a6c7a753b816b878dd4368f5ba27d5644bbe4c3132dc44e940a8372c WHIRLPOOL 7f2c1d694e54378b81046c0162b1bcc68951d2e37601fbf44d517b6205a3fb42ac0b107f504d533230595d7f7c9c3228294a3f1ccf07b1da7d0d1b10616969ec
DIST guava-15.0-sources.jar 1234606 SHA256 1a3f78cfd4a44f63af00afe36f2175d41ed24d25aedf3542f47664f81815a211 SHA512 fe4fcc723115fbc4f824a1358d81e98565b92b6d682b86d25b566f1e9b6c266fac42a3502e6d49d1faa87fdfbadf206043b4d8965402dd821333dda00b93819e WHIRLPOOL e9f3466073542b4d93d6f934e241e5244a5f39b0b35a83836721524bacb8e259d4f0a05cf32c53932f8decf6589e6e896873cb5bec141b0f029fd2c1f667b15a
DIST guava-16.0-sources.jar 1259298 SHA256 ce615d97c302e1815c8efe098de8c107be629dd95ba9432c701ba17743f6cfd9 SHA512 706d0da9099b0c453e570bda9fbec4c2e51c4688d837bcdc36db38e4654bf1cb1e83e03ace691fbc845ab0eca8d8e12f1a8f1fd2e03fd739283d9f58afc600a3 WHIRLPOOL 0fd6103acf4a4daa46c9604d3c80c4f11aa6d6545a3ef4afd0122a074b885ce9a56431a8b094a3c9f89f582032dae620410e79fa89749f70448b7e055851e4ab
DIST guava-16.0.1-sources.jar 1261127 SHA256 154ce0c88dce526b822417c8402901ad0a5a299156b38c79b40cce72b72b3c2b SHA512 b6d8db3a139a2490692208cba1788db68e0c0d574f91582367d81f6d32ed7959646fc3ac14651c9de1b9b839bb4d58ec137feb928d7d183d1c2c602a4da8e88d WHIRLPOOL be647c7deef2cce8b62d4173543debd8255f6662545bc9ebd75f3b55210791dc95ff1690b6c8a983c152d1ed2f2a4f2b1f1ed3fb69b13a1d2280726a690d276b
DIST guava-r07.zip 3044916 SHA256 3d0da5843235b26dc5d47b75df48a6f06f0cc428534580762352b3b00fa45c40 SHA512 1ea4c0b4a7747fb555150283eb851da9d96ec705f1b8e05709b533e923a2615dd82979afbf729093c493e0c11a5f7841f576a6a56a4e9fd5a7e8af224aca956f WHIRLPOOL 3718e030038eaf597b1d35e318eeb708df8d5b66a606d5ffa1fc0e7a742f22f271d6fa6d72d1ce138fcd206e32c7680c5bccf4400f3fc969f41623a7d1f88013

@ -0,0 +1,28 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/guava/guava-16.0.1.ebuild,v 1.1 2014/02/13 08:49:08 radhermit Exp $
EAPI=5
JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="A collection of Google's core Java libraries"
HOMEPAGE="http://code.google.com/p/guava-libraries/"
SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/${PV}/${P}-sources.jar"
LICENSE="Apache-2.0"
SLOT="16"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
COMMON_DEP="
dev-java/javax-inject:0
dev-java/jsr305:0
java-virtuals/jdk-with-com-sun:0"
RDEPEND="${COMMON_DEP}
>=virtual/jre-1.6"
DEPEND="${COMMON_DEP}
app-arch/unzip
>=virtual/jdk-1.7" # http://code.google.com/p/guava-libraries/issues/detail?id=635
JAVA_GENTOO_CLASSPATH="jsr305,javax-inject"

@ -0,0 +1 @@
DIST hy-0.9.12.tar.gz 166882 SHA256 d9e6341132144f11fa53f4601de052b14cca276d52968b31bb7ca23b1cd2cfd5 SHA512 2791e0f0640b1b20a57de1e60dcffc67e73b81010a25139cab9cb84a396f238ae369eb585f107280cb0f9b1abd75af558a4e896bc9970477458cdfa5618ca3f7 WHIRLPOOL d27fa19e34b27d130c7d50f7d8f9c4824dc20ea51552105ce676b10b58e3790839af96dc1486d7165a072a9837675fd9a709b25b9a96793b33a3918bea09eabb

@ -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-lang/hy/hy-0.9.12.ebuild,v 1.1 2014/02/14 09:13:35 patrick Exp $
EAPI=5
#RESTRICT="test" # needs some pointy sticks
PYTHON_COMPAT=(python2_7 python3_3)
inherit distutils-r1
DESCRIPTION="A LISP dialect running in python"
HOMEPAGE="http://hylang.org/"
SRC_URI="https://github.com/hylang/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
RDEPEND="dev-python/flake8
>=dev-python/rply-0.7.0"
DEPEND="${RDEPEND}
test? ( dev-python/tox
dev-python/nose
dev-python/sphinx
dev-python/coverage
dev-python/astor
)"
python_test() {
nosetests || die "Tests failed under ${EPYTHON}"
}

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>python</herd>
<maintainer>
<email>patrick@gentoo.org</email>
<name>Patrick Lauer</name>
</maintainer>
</pkgmetadata>

@ -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/dev-libs/clens/clens-0.7.0.ebuild,v 1.4 2013/10/09 10:10:56 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-libs/clens/clens-0.7.0.ebuild,v 1.5 2014/02/13 14:23:46 jer Exp $
EAPI=5
@ -12,7 +12,7 @@ SRC_URI="https://opensource.conformal.com/snapshots/${PN}/${P}.tar.gz"
LICENSE="ISC BSD BSD-4"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~x86"
KEYWORDS="~amd64 hppa ~x86"
src_prepare() {
epatch "${FILESDIR}"/${P}-no-arc4random.patch

@ -1 +1,2 @@
DIST pcsc-cyberjack-3.99.5final.SP05.tar.bz2 761177 SHA256 ac35afef89660cd43edabc4146463edf6b8361d1c7a7e1880239362167d3b311 SHA512 634be5a0b1619423ebaeed9523ada95056725929ee68a1f9bb8a6d22285836f17a7de4fb634010d49fc49c952f0ba8759466ef5f90ffcbb0f9a392b2dfacaa9c WHIRLPOOL 860872054b2c397e67f36c8d211e1461ad6039615f117e2f177b7d6cdd9d46aa3a4b83f13f2a349dd27e3b323f4d70b89c831e491f72475dcc459b8110162184
DIST pcsc-cyberjack_3.99.5final.SP03.tar.gz 1485952 SHA256 fa5324d8a270d50aec20345cb57362f684ddadd3a50dbd0773ee13d2d87bc0a9 SHA512 a091a09b501d7a7c757f0a458007f44ac281cbeaaf5bc3c2aa89915ee7a39478e6f80b6f24fec77be753c8d77deeda2858b7a806e3c982f54c199bd797288e05 WHIRLPOOL 51429512a9037e6ec4a98cc33576176cafda5fe3a3b33c56b2d928c7a7bc06135ac93e92a713836e4dc20e90f6106f9ca3643de5baed7c25672c26f6fc4a6368

@ -0,0 +1,81 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyberjack/cyberjack-3.99.5_p05.ebuild,v 1.1 2014/02/13 22:26:00 idl0r Exp $
EAPI=5
inherit autotools versionator eutils linux-info toolchain-funcs udev
MY_PV="${PV/_p/_SP}"
MY_PV2="${PV/_p/final.SP}"
MY_P="pcsc-${PN}-${MY_PV2}"
MY_P2="${PN}-$(get_version_component_range 4 $MY_PV)"
DESCRIPTION="REINER SCT cyberJack pinpad/e-com USB user space driver library"
HOMEPAGE="http://www.reiner-sct.de/ http://www.libchipcard.de/"
SRC_URI="http://support.reiner-sct.de/downloads/LINUX/V${MY_PV}/${MY_P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="fox static-libs threads +udev +usb"
# FIXME:
# xml is actually optional but the code is still used anyway. We'll have to wait
# until upstream fixed it.
COMMON_DEPEND="sys-apps/pcsc-lite
usb? ( virtual/libusb:1 )
fox? (
>=x11-libs/fox-1.6
dev-libs/libxml2
)"
RDEPEND="${COMMON_DEPEND}
udev? ( virtual/udev )"
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig"
S=${WORKDIR}/${MY_P2}
DOCS="ChangeLog NEWS doc/README.txt"
pkg_setup() {
CONFIG_CHECK="~USB_SERIAL_CYBERJACK"
linux-info_pkg_setup
}
src_prepare() {
epatch "${FILESDIR}/${P}-install.patch"
epatch "${FILESDIR}/${P}-manpages.patch"
epatch "${FILESDIR}/${P}-returnvalue.patch"
eautoreconf
}
src_configure() {
econf \
--sysconfdir=/etc/${PN} \
--disable-hal \
--enable-pcsc \
$(use_enable static-libs static) \
$(use_enable usb nonserial) \
$(use_enable threads) \
$(use_enable fox xml2) \
$(use_enable fox) \
--with-usbdropdir="$($(tc-getPKG_CONFIG) libpcsclite --variable=usbdropdir)"
}
src_install() {
default
prune_libtool_files --all
use udev && udev_newrules "${FILESDIR}"/${PN}-r1.rules 92-${PN}.rules #388329
}
pkg_postinst() {
local conf="${EROOT}etc/${PN}/${PN}.conf"
elog
elog "To configure logging, key beep behaviour etc. you need to"
elog "copy ${conf}.default"
elog "to ${conf}"
elog "and modify the latter as needed."
elog
}

@ -0,0 +1,26 @@
From c107dd6db4967a04297eab120500a7fc5c93f221 Mon Sep 17 00:00:00 2001
From: Christian Ruppert <idl0r@gentoo.org>
Date: Thu, 13 Feb 2014 23:10:37 +0100
Subject: [PATCH 3/3] Do not install pcscd_init.diff
Signed-off-by: Christian Ruppert <idl0r@gentoo.org>
---
tools/cyberjack/scripts/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/cyberjack/scripts/Makefile.am b/tools/cyberjack/scripts/Makefile.am
index e9cc408..e2098d2 100644
--- a/tools/cyberjack/scripts/Makefile.am
+++ b/tools/cyberjack/scripts/Makefile.am
@@ -1,6 +1,6 @@
cdscriptdir=$(libdir)/cyberjack
-cdscript_SCRIPTS=getdist.sh pcscd_init.diff
+cdscript_SCRIPTS=getdist.sh
-EXTRA_DIST=$(cdscript_SCRIPTS)
+EXTRA_DIST=$(cdscript_SCRIPTS) pcscd_init.diff
--
1.8.3.2

@ -0,0 +1,34 @@
From e5d3ac2ab70cb773671a63dfed45816d6e24d36d Mon Sep 17 00:00:00 2001
From: Christian Ruppert <idl0r@gentoo.org>
Date: Thu, 13 Feb 2014 21:40:48 +0100
Subject: [PATCH 1/3] Fix installation of man pages
Signed-off-by: Christian Ruppert <idl0r@gentoo.org>
---
doc/Makefile.am | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a0a68f4..cba2e30 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -6,14 +6,12 @@ DOCFILES=\
#docfiledir=$(datarootdir)/doc/$(PACKAGE)
#docfile_DATA=$(DOCFILES)
-manpagedir=$(mandir)
-manpage_DATA= \
- cyberjack.8
+man8_MANS=cyberjack.8
EXTRA_DIST=\
README.xml LIESMICH.xml \
verifypin_ascii.c verifypin_fpin2.c \
- $(DOCFILES) $(manpage_DATA)
+ $(DOCFILES) $(man8_MANS)
%.ps: %.xml
--
1.8.3.2

@ -0,0 +1,29 @@
From b6d3ab6d0324f8b462f57aaa551bd1d4aa1465f3 Mon Sep 17 00:00:00 2001
From: Christian Ruppert <idl0r@gentoo.org>
Date: Thu, 13 Feb 2014 22:19:40 +0100
Subject: [PATCH 2/3] Fix return value of rsct_platform_create_com if
--disable-nonserial
Return NULL instead of CJ_ERR_OPENING_DEVICE (int).
Signed-off-by: Christian Ruppert <idl0r@gentoo.org>
---
cjeca32/Platform_unix.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cjeca32/Platform_unix.cpp b/cjeca32/Platform_unix.cpp
index e3f4997..cbe6876 100644
--- a/cjeca32/Platform_unix.cpp
+++ b/cjeca32/Platform_unix.cpp
@@ -54,7 +54,7 @@ CBaseCommunication *rsct_platform_create_com(const char *deviceName, CReader *re
com=new CUSBUnix(deviceName, reader);
# else
/* libusb and libhal not supported for serial devices */
- return CJ_ERR_OPENING_DEVICE;
+ return NULL;
# endif
else
com=new CSerialUnix(deviceName, reader);
--
1.8.3.2

@ -0,0 +1,18 @@
# If not adding the device, go away
ACTION!="add", GOTO="cyberjack_rules_end"
SUBSYSTEM!="usb", GOTO="cyberjack_rules_end"
ENV{DEVTYPE}!="usb_device", GOTO="cyberjack_rules_end"
ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0100", MODE="660", GROUP="pcscd"
ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0300", MODE="660", GROUP="pcscd"
ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0400", MODE="660", GROUP="pcscd"
ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0401", MODE="660", GROUP="pcscd"
ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0500", MODE="660", GROUP="pcscd"
ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0501", MODE="660", GROUP="pcscd"
ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0502", MODE="660", GROUP="pcscd"
ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0504", MODE="660", GROUP="pcscd"
ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0505", MODE="660", GROUP="pcscd"
# All done
LABEL="cyberjack_rules_end"

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

Loading…
Cancel
Save