Sync with portage [Tue Apr 3 09:30:47 MSK 2012].

mhiretskiy
root 12 years ago
parent a0514838c3
commit 08c22e9953

@ -1,7 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/advancecomp/advancecomp-1.15.ebuild,v 1.8 2011/01/30 09:24:36 xarthisius Exp $
# $Header: /var/cvsroot/gentoo-x86/app-arch/advancecomp/advancecomp-1.15.ebuild,v 1.9 2012/04/02 19:22:50 pacho Exp $
EAPI=4
inherit eutils
DESCRIPTION="Recompress ZIP, PNG and MNG using deflate 7-Zip, considerably improving compression"
@ -13,32 +14,33 @@ SLOT="0"
KEYWORDS="alpha amd64 hppa ppc ~ppc64 x86 ~x86-fbsd"
IUSE="png mng"
DEPEND="sys-libs/zlib app-arch/bzip2"
DEPEND="sys-libs/zlib
app-arch/bzip2"
RDEPEND="${DEPEND}"
src_unpack() {
unpack ${A}
RESTRICT="test" #282441
src_prepare() {
# bzip2 support wont compile, here's a quick patch.
cd "${S}"; epatch "${FILESDIR}"/${PN}-1.13-bzip2-compile-plz-k-thx.diff
epatch "${FILESDIR}"/${PN}-1.13-bzip2-compile-plz-k-thx.diff
}
src_compile() {
econf --enable-bzip2 || die
emake || die
src_configure() {
econf --enable-bzip2
}
src_install() {
dobin advdef advzip
use png && {
if use png; then
dobin advpng
doman doc/advpng.1
}
fi
use mng && {
if use mng; then
dobin advmng
doman doc/advmng.1
}
fi
dodoc HISTORY AUTHORS README
doman doc/advdef.1 doc/advzip.1

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart/bootchart-0.9-r4.ebuild,v 1.2 2011/01/19 01:06:34 fordfrog Exp $
# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart/bootchart-0.9-r4.ebuild,v 1.3 2012/04/02 16:43:24 ago Exp $
EAPI="2"
JAVA_PKG_IUSE="source"
@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~x86"
KEYWORDS="amd64 ~hppa ~x86"
IUSE="acct debug doc java"
DEPEND="

@ -1,12 +1,11 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart2/bootchart2-0.14.2.ebuild,v 1.1 2012/04/02 07:19:16 jlec Exp $
# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart2/bootchart2-0.14.2-r1.ebuild,v 1.1 2012/04/02 13:06:32 jlec Exp $
EAPI=4
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABI="2.7-pypy-*"
inherit linux-info python systemd toolchain-funcs
@ -21,9 +20,9 @@ IUSE="svg"
RDEPEND="
!app-benchmarks/bootchart
dev-python/pycairo[svg=]"
DEPEND="${RDEPEND}
"
dev-python/pycairo[svg=]
dev-python/pygtk"
DEPEND="${RDEPEND}"
CONFIG_CHECK="~PROC_EVENTS ~TASKSTATS ~TASK_DELAY_ACCT ~TMPFS"
@ -36,6 +35,13 @@ src_prepare() {
-i Makefile || die
}
src_test() {
testing() {
emake test
}
python_execute_function testing
}
src_install() {
export NO_PYTHON_COMPILE=0
export DOCDIR=/usr/share/doc/${PF}
@ -52,16 +58,20 @@ src_install() {
py-install-compile
}
python_execute_function installation
}
src_test() {
testing() {
emake test
}
python_execute_function testing
newinitd "${FILESDIR}"/${PN}.init ${PN}
}
pkg_postinst() {
elog "Please add the init script to your default runlevel"
elog "rc-update add bootchart2 default"
echo ""
elog "Please review /usr/share/doc/${PF}/README"
elog "for further usage informations."
echo
python_mod_optimize pybootchartgui
}
pkg_postrm() {
python_mod_cleanup pybootchartgui
}

@ -0,0 +1,26 @@
#!/sbin/runscript
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart2/files/bootchart2.init,v 1.1 2012/04/02 13:06:33 jlec Exp $
depend() {
use localmount
}
start() {
if /bin/grep -q "rdinitrd=/sbin/bootchartd" /proc/cmdline; then
if /bin/pidof bootchart-collector> /dev/null 2>&1; then
ebegin "Scheduling termination of Bootchart"
/sbin/bootchartd start
/sbin/bootchartd wait &
eend $?
else
elog "No bootchart process found!"
eindent
elog "This script does not start bootchart, but only schedules its termination."
elog "Bootchart should be started from the kernel command line."
elog "Please check the README on how to do that."
eoutdent
eend 0
fi
}

@ -1,2 +1,3 @@
DIST emacs-24.0.93.tar.gz 51257120 RMD160 6a3b6ae0ecab96a53828856de6db0c016cc5d47f SHA1 0b98ecf3e9f44497bfaf4203c2afc81252c4bafe SHA256 4a100accb2f76231aed4dddb32d3725dec131280ad3bdf1b39b52ce337a210fe
DIST emacs-24.0.94.tar.gz 51251891 RMD160 3593d6a003b556f3755ba6ea3f8a92ba1b5ba2af SHA1 d70fe6da2d2b943423fcf16badb0294566710eaa SHA256 238dacb608e74fce088cde61b82907ba6ae5d975e88f38a0b199dbdbdb28feb5
DIST emacs-24.0.95.tar.gz 51371928 RMD160 14a0ca326c18dc549495e862d83eb9e1917d2ead SHA1 09c1eaed7400f8cc0e5dab9fb2337c3c4cee5449 SHA256 434b8e4a27d376257a6fe93b35936466985ac45c90310e6041e0a0577752df64

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.93.ebuild,v 1.3 2012/02/10 16:54:39 grobian Exp $
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.93.ebuild,v 1.4 2012/04/02 17:29:27 ulm Exp $
EAPI=4
@ -16,7 +16,7 @@ if [[ ${PV##*.} = 9999 ]]; then
SRC_URI=""
else
SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz
ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${PV}.tar.gz"
mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.gz"
# FULL_VERSION keeps the full version number, which is needed in
# order to determine some path information correctly for copy/move
# operations later on

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.94.ebuild,v 1.1 2012/02/27 22:34:38 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.94.ebuild,v 1.2 2012/04/02 17:29:27 ulm Exp $
EAPI=4
@ -16,7 +16,7 @@ if [[ ${PV##*.} = 9999 ]]; then
SRC_URI=""
else
SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz
ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${PV}.tar.gz"
mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.gz"
# FULL_VERSION keeps the full version number, which is needed in
# order to determine some path information correctly for copy/move
# operations later on

@ -0,0 +1,369 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.95.ebuild,v 1.1 2012/04/02 17:29:27 ulm Exp $
EAPI=4
inherit autotools elisp-common eutils flag-o-matic multilib
if [[ ${PV##*.} = 9999 ]]; then
EBZR_PROJECT="emacs"
EBZR_BRANCH="trunk"
EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EBZR_BRANCH}/"
# "Nosmart" is much faster for initial branching.
EBZR_INITIAL_URI="nosmart+${EBZR_REPO_URI}"
inherit bzr
SRC_URI=""
else
SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz
mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.gz"
# FULL_VERSION keeps the full version number, which is needed in
# order to determine some path information correctly for copy/move
# operations later on
FULL_VERSION="${PV%%_*}"
S="${WORKDIR}/emacs-${FULL_VERSION}"
fi
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
HOMEPAGE="http://www.gnu.org/software/emacs/"
LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
SLOT="24"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="alsa aqua athena dbus gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
REQUIRED_USE="aqua? ( !X )"
RDEPEND="sys-libs/ncurses
>=app-admin/eselect-emacs-1.2
net-libs/liblockfile
hesiod? ( net-dns/hesiod )
kerberos? ( virtual/krb5 )
alsa? ( media-libs/alsa-lib )
gpm? ( sys-libs/gpm )
dbus? ( sys-apps/dbus )
gnutls? ( net-libs/gnutls )
libxml2? ( >=dev-libs/libxml2-2.2.0 )
selinux? ( sys-libs/libselinux )
X? (
x11-libs/libXmu
x11-libs/libXt
x11-misc/xbitmaps
gconf? ( >=gnome-base/gconf-2.26.2 )
gsettings? ( >=dev-libs/glib-2.28.6 )
gif? ( media-libs/giflib )
jpeg? ( virtual/jpeg )
png? ( >=media-libs/libpng-1.4:0 )
svg? ( >=gnome-base/librsvg-2.0 )
tiff? ( media-libs/tiff )
xpm? ( x11-libs/libXpm )
imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
xft? (
media-libs/fontconfig
media-libs/freetype
x11-libs/libXft
m17n-lib? (
>=dev-libs/libotf-0.9.4
>=dev-libs/m17n-lib-1.5.1
)
)
gtk? (
gtk3? ( x11-libs/gtk+:3 )
!gtk3? ( x11-libs/gtk+:2 )
)
!gtk? (
Xaw3d? ( x11-libs/libXaw3d )
!Xaw3d? (
athena? ( x11-libs/libXaw )
!athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
)
)
)"
DEPEND="${RDEPEND}
alsa? ( dev-util/pkgconfig )
dbus? ( dev-util/pkgconfig )
gnutls? ( dev-util/pkgconfig )
libxml2? ( dev-util/pkgconfig )
X? ( dev-util/pkgconfig )
gzip-el? ( app-arch/gzip )"
RDEPEND="${RDEPEND}
>=app-emacs/emacs-common-gentoo-1.3[X?]"
EMACS_SUFFIX="emacs-${SLOT}"
SITEFILE="20${PN}-${SLOT}-gentoo.el"
src_prepare() {
if [[ ${PV##*.} = 9999 ]]; then
FULL_VERSION=$(sed -n 's/^AC_INIT(emacs,[ \t]*\([^ \t,)]*\).*/\1/p' \
configure.in)
[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
einfo "Emacs branch: ${EBZR_BRANCH}"
einfo "Revision: ${EBZR_REVISION:-${EBZR_REVNO}}"
einfo "Emacs version number: ${FULL_VERSION}"
[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
|| die "Upstream version number changed to ${FULL_VERSION}"
fi
epatch "${FILESDIR}"/emacs-24.0.92-ns-appdirs.patch
if ! use alsa; then
# ALSA is detected even if not requested by its USE flag.
# Suppress it by supplying pkg-config with a wrong library name.
sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
|| die "unable to sed configure.in"
fi
if ! use gzip-el; then
# Emacs' build system automatically detects the gzip binary and
# compresses el files. We don't want that so confuse it with a
# wrong binary name
sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
|| die "unable to sed configure.in"
fi
AT_M4DIR=m4 eautoreconf
}
src_configure() {
ALLOWED_FLAGS=""
strip-flags
if use sh; then
replace-flags -O[1-9] -O0 #262359
elif use ia64; then
replace-flags -O[2-9] -O1 #325373
else
replace-flags -O[3-9] -O2
fi
local myconf
if use alsa && ! use sound; then
einfo "Although sound USE flag is disabled you chose to have alsa,"
einfo "so sound is switched on anyway."
myconf="${myconf} --with-sound"
else
myconf="${myconf} $(use_with sound)"
fi
if use X; then
myconf="${myconf} --with-x --without-ns"
myconf="${myconf} $(use_with gconf)"
myconf="${myconf} $(use_with gsettings)"
myconf="${myconf} $(use_with toolkit-scroll-bars)"
myconf="${myconf} $(use_with wide-int)"
myconf="${myconf} $(use_with gif) $(use_with jpeg)"
myconf="${myconf} $(use_with png) $(use_with svg rsvg)"
myconf="${myconf} $(use_with tiff) $(use_with xpm)"
myconf="${myconf} $(use_with imagemagick)"
if use xft; then
myconf="${myconf} --with-xft"
myconf="${myconf} $(use_with m17n-lib libotf)"
myconf="${myconf} $(use_with m17n-lib m17n-flt)"
else
myconf="${myconf} --without-xft"
myconf="${myconf} --without-libotf --without-m17n-flt"
use m17n-lib && ewarn \
"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
fi
if use gtk; then
einfo "Configuring to build with GIMP Toolkit (GTK+)"
myconf="${myconf} --with-x-toolkit=$(usev gtk3 || echo gtk)"
local f
for f in athena Xaw3d motif; do
use ${f} && ewarn "USE flag \"${f}\" ignored" \
"(superseded by \"gtk\")"
done
elif use athena || use Xaw3d; then
einfo "Configuring to build with Athena/Lucid toolkit"
myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
use motif && ewarn "USE flag \"motif\" ignored" \
"(superseded by \"athena\" or \"Xaw3d\")"
elif use motif; then
einfo "Configuring to build with Motif toolkit"
myconf="${myconf} --with-x-toolkit=motif"
else
einfo "Configuring to build with no toolkit"
myconf="${myconf} --with-x-toolkit=no"
fi
! use gtk && use gtk3 \
&& ewarn "USE flag \"gtk3\" has no effect if \"gtk\" is not set."
elif use aqua; then
einfo "Configuring to build with Cocoa support"
myconf="${myconf} --with-ns --disable-ns-self-contained"
myconf="${myconf} --without-x"
else
myconf="${myconf} --without-x --without-ns"
fi
if [[ ${PV##*.} = 9999 ]]; then
# These variables are not needed for building. We add them to
# configure options because they are stored in the Emacs binary
# and available in variable "system-configuration-options".
myconf="${myconf} EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}"
fi
# According to configure, this option is only used for GNU/Linux
# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
# out the location because $(get_libdir) does not necessarily return
# something that matches the host OS's libdir naming (e.g. RHEL).
local crtdir=$($(tc-getCC) -print-file-name=crt1.o)
crtdir=${crtdir%/*}
econf \
--program-suffix=-${EMACS_SUFFIX} \
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
--with-crt-dir="${crtdir}" \
--with-gameuser="${GAMES_USER_DED:-games}" \
--without-compress-info \
--disable-maintainer-mode \
$(use_with hesiod) \
$(use_with kerberos) $(use_with kerberos kerberos5) \
$(use_with gpm) \
$(use_with dbus) \
$(use_with gnutls) \
$(use_with libxml2 xml2) \
$(use_with selinux) \
${myconf}
}
src_compile() {
export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
if [[ ${PV##*.} = 9999 ]]; then
emake CC="$(tc-getCC)" bootstrap
# cleanup, otherwise emacs will be dumped again in src_install
(cd src; emake versionclean)
fi
# set last component of emacs-version to (package revision + 1)
touch src/emacs-${FULL_VERSION}.${PR#r}
emake CC="$(tc-getCC)"
}
src_install () {
local i m
emake install DESTDIR="${D}"
rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
|| die "removing duplicate emacs executable failed"
mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \
|| die "moving Emacs executable failed"
# move man pages to the correct place
for m in "${ED}"/usr/share/man/man1/* ; do
mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed"
done
# move info dir to avoid collisions with the dir file generated by portage
mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
|| die "moving info dir failed"
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
# avoid collision between slots, see bug #169033 e.g.
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
rm -rf "${ED}"/usr/share/{applications,icons}
rm "${ED}"/var/lib/games/emacs/{snake,tetris}-scores
keepdir /var/lib/games/emacs
# remove unused <version>/site-lisp dir
rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
local c=";;"
if use source; then
insinto /usr/share/emacs/${FULL_VERSION}/src
# This is not meant to install all the source -- just the
# C source you might find via find-function
doins src/*.{c,h,m}
doins -r src/{m,s}
rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
c=""
fi
sed 's/^X//' >"${T}/${SITEFILE}" <<-EOF
X
;;; ${PN}-${SLOT} site-lisp configuration
X
(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
X ${c}(setq find-function-C-source-directory
X ${c} "${EPREFIX}/usr/share/emacs/${FULL_VERSION}/src")
X (let ((path (getenv "INFOPATH"))
X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
X (and path
X ;; move Emacs Info dir before anything else in /usr/share/info
X (let* ((p (cons nil (split-string path ":" t))) (q p))
X (while (and (cdr q) (not (string-match re (cadr q))))
X (setq q (cdr q)))
X (setcdr q (cons dir (delete dir (cdr q))))
X (setq Info-directory-list (prune-directory-list (cdr p)))))))
EOF
elisp-site-file-install "${T}/${SITEFILE}" || die
dodoc README BUGS
if use aqua; then
dodir /Applications/Gentoo
rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
mv nextstep/Emacs.app \
"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
elog "Emacs${EMACS_SUFFIX#emacs}.app is in ${EPREFIX}/Applications/Gentoo."
elog "You may want to copy or symlink it into /Applications by yourself."
fi
}
pkg_preinst() {
# move Info dir file to correct name
local infodir=/usr/share/info/${EMACS_SUFFIX} f
if [[ -f ${ED}${infodir}/dir.orig ]]; then
mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
else
# this should not happen in EAPI 4
ewarn "Regenerating Info directory index in ${infodir} ..."
rm -f "${ED}"${infodir}/dir{,.*}
for f in "${ED}"${infodir}/*; do
if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
install-info --info-dir="${ED}"${infodir} "${f}" \
|| die "install-info failed"
fi
done
fi
}
pkg_postinst() {
local f
for f in "${EROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
[[ -e ${f} ]] || touch "${f}"
done
chown "${GAMES_USER_DED:-games}" "${EROOT}"/var/lib/games/emacs
elisp-site-regen
eselect emacs update ifunset
if use X; then
elog "You need to install some fonts for Emacs."
elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
elog "machine would satisfy basic Emacs requirements under X11."
elog "See also http://www.gentoo.org/proj/en/lisp/emacs/xft.xml"
elog "for how to enable anti-aliased fonts."
elog
fi
elog "You can set the version to be started by /usr/bin/emacs through"
elog "the Emacs eselect module, which also redirects man and info pages."
elog "Therefore, several Emacs versions can be installed at the same time."
elog "\"man emacs.eselect\" for details."
elog
elog "If you upgrade from a previous major version of Emacs, then it is"
elog "strongly recommended that you use app-admin/emacs-updater to rebuild"
elog "all byte-compiled elisp files of the installed Emacs packages."
}
pkg_postrm() {
elisp-site-regen
eselect emacs update ifunset
}

@ -1,3 +1,2 @@
DIST magit-0.8.1.tar.gz 211915 RMD160 78812232a3b0a9310c83cadbd01abedb08faca86 SHA1 7c8e6c36146ba71f2f8abad2568c04ec32d3cb79 SHA256 0903a055b0eb3acdfbb439ea5829cfcbd1186120e6d8c7456eae8f4576195fcd
DIST magit-0.8.2.tar.gz 214803 RMD160 e451d17d3686004886b62b5ea05afdaaf0a8bb1c SHA1 f7d188fa78adee10d1d159199dfa8ef23785f968 SHA256 fc02c23e3e8994e9c3e3299d560d0cbfed888dcc66088f06b8cea3bc89cd6ae8
DIST magit-1.0.0.tar.gz 60561 RMD160 bdc7d134883ea06e66fffd9e9a75ec5374bec0e7 SHA1 58773e84870d9d8d1138619e1f3928d1696aa168 SHA256 f87393137f2ddf814dd79e31986289a00357fa479774b4c3b0f19bd440a2cdc1
DIST magit-1.1.1.tar.gz 97241 RMD160 216dcf8082117cc699ed83a412d9e4dc7622a8b6 SHA1 f490dfd38a7c1093216e1458886ace54560e7355 SHA256 9ffdfddad0023262df6e7ff90a15a3f170e1a8127c9cec848d54d57b63c7e57e

@ -1,23 +0,0 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emacs/magit/magit-0.8.1.ebuild,v 1.1 2010/06/13 18:08:45 fauli Exp $
inherit elisp
DESCRIPTION="An Emacs mode for GIT"
HOMEPAGE="http://philjackson.github.com/magit/"
SRC_URI="http://github.com/downloads/philjackson/magit/${P}.tar.gz"
LICENSE="GPL-3 FDL-1.2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
SITEFILE="50magit-gentoo.el"
src_install() {
elisp-install ${PN} magit.{el,elc} || die
elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
doinfo magit.info || die
dodoc AUTHORS NEWS README
}

@ -1,23 +0,0 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emacs/magit/magit-0.8.2.ebuild,v 1.1 2010/07/18 06:25:52 fauli Exp $
inherit elisp
DESCRIPTION="An Emacs mode for GIT"
HOMEPAGE="http://philjackson.github.com/magit/"
SRC_URI="http://github.com/downloads/philjackson/magit/${P}.tar.gz"
LICENSE="GPL-3 FDL-1.2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
SITEFILE="50magit-gentoo.el"
src_install() {
elisp-install ${PN} magit.{el,elc} || die
elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
doinfo magit.info || die
dodoc AUTHORS NEWS README
}

@ -1,14 +1,14 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emacs/magit/magit-1.0.0.ebuild,v 1.1 2011/04/17 15:32:04 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emacs/magit/magit-1.0.0.ebuild,v 1.2 2012/04/02 17:54:02 ulm Exp $
EAPI=4
inherit elisp
DESCRIPTION="An Emacs mode for GIT"
HOMEPAGE="http://philjackson.github.com/magit/"
SRC_URI="http://github.com/downloads/philjackson/magit/${P}.tar.gz"
HOMEPAGE="http://magit.github.com/magit/"
SRC_URI="http://github.com/downloads/magit/magit/${P}.tar.gz"
LICENSE="GPL-3 FDL-1.2"
SLOT="0"

@ -0,0 +1,36 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emacs/magit/magit-1.1.1.ebuild,v 1.1 2012/04/02 17:54:02 ulm Exp $
EAPI=4
inherit elisp
DESCRIPTION="An Emacs mode for GIT"
HOMEPAGE="http://magit.github.com/magit/"
SRC_URI="http://github.com/downloads/magit/magit/${P}.tar.gz"
LICENSE="GPL-3 FDL-1.2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="contrib"
SITEFILE="50magit-gentoo.el"
src_compile() {
emake core docs
use contrib && emake contrib
}
src_install() {
elisp-install ${PN} magit.{el,elc} \
magit-{svn,topgit,stgit,key-mode,bisect}.{el,elc} || die
elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
doinfo magit.info
dodoc README.md
if use contrib; then
elisp-install ${PN} contrib/*.{el,elc} || die
dobin contrib/magit
fi
}

@ -12,4 +12,7 @@
support for cherry picking, reverting, merging, rebasing, and other common
Git operations.
</longdescription>
<use>
<flag name='contrib'>Install user-contributed files</flag>
</use>
</pkgmetadata>

@ -0,0 +1,54 @@
From 0c08a84c04b166ab6479716e2c33cd444d7e3dbe Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Date: Mon, 2 Apr 2012 18:46:32 +0200
Subject: [PATCH] Make ICU build with icu-49 by removing no-longer used variables.
Signed-off-by: Tomas Chvatal <tchvatal@suse.cz>
---
i18npool/source/breakiterator/data/char.txt | 1 -
i18npool/source/breakiterator/data/char_in.txt | 3 ---
2 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/i18npool/source/breakiterator/data/char.txt b/i18npool/source/breakiterator/data/char.txt
index 8e49a56..acb932e 100644
--- a/i18npool/source/breakiterator/data/char.txt
+++ b/i18npool/source/breakiterator/data/char.txt
@@ -16,7 +16,6 @@
$CR = [\p{Grapheme_Cluster_Break = CR}];
$LF = [\p{Grapheme_Cluster_Break = LF}];
$Control = [\p{Grapheme_Cluster_Break = Control}];
-$Prepend = [\p{Grapheme_Cluster_Break = Prepend}];
$Extend = [\p{Grapheme_Cluster_Break = Extend}];
$SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}];
# True Indic wants to move by syllables. Break up SpacingMark. This based on Unicode 6.0 data
diff --git a/i18npool/source/breakiterator/data/char_in.txt b/i18npool/source/breakiterator/data/char_in.txt
index 5e1ed67..5ad12a7 100644
--- a/i18npool/source/breakiterator/data/char_in.txt
+++ b/i18npool/source/breakiterator/data/char_in.txt
@@ -15,7 +15,6 @@
$CR = [\p{Grapheme_Cluster_Break = CR}];
$LF = [\p{Grapheme_Cluster_Break = LF}];
$Control = [\p{Grapheme_Cluster_Break = Control}];
-$Prepend = [\p{Grapheme_Cluster_Break = Prepend}];
$Extend = [\p{Grapheme_Cluster_Break = Extend}];
$SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}];
$BengaliLetter = [\u0985-\u09B9 \u09CE \u09DC-\u09E1 \u09F0-\u09F1];
@@ -72,7 +71,6 @@ $L ($L | $V | $LV | $LVT);
[^$Control $CR $LF] $Extend;
[^$Control $CR $LF] $SpacingMark;
-$Prepend [^$Control $CR $LF];
## -------------------------------------------------
@@ -94,7 +92,6 @@ $T ($LVT | $T);
$Extend [^$Control $CR $LF];
$SpacingMark [^$Control $CR $LF];
-[^$Control $CR $LF] $Prepend;
## -------------------------------------------------
--
1.7.3.4

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.2.2.ebuild,v 1.3 2012/04/02 07:39:49 scarabeus Exp $
# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.2.2.ebuild,v 1.5 2012/04/02 16:58:15 scarabeus Exp $
EAPI=4
@ -194,6 +194,7 @@ PATCHES=(
# this can't be upstreamed :(
"${FILESDIR}/${PN}-system-pyuno.patch"
"${FILESDIR}/${PN}-3.5-propagate-gb_FULLDEPS.patch"
"${FILESDIR}/${PN}-3.5.2-icu-49.patch"
)
REQUIRED_USE="
@ -237,8 +238,11 @@ pkg_setup() {
python_set_active_version 2
python_pkg_setup
[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_pretend
if [[ ${MERGE_TYPE} != binary ]]; then
CHECKREQS_MEMORY="512M"
CHECKREQS_DISK_BUILD="6G"
check-reqs_pkg_pretend
fi
if ! use gtk; then
ewarn "If you want the LibreOffice systray quickstarter to work"
ewarn "activate the 'gtk' use flag."

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.33 2012/04/02 07:39:49 scarabeus Exp $
# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.34 2012/04/02 09:19:02 jlec Exp $
EAPI=4
@ -237,8 +237,11 @@ pkg_setup() {
python_set_active_version 2
python_pkg_setup
[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_pretend
if [[ ${MERGE_TYPE} != binary ]]; then
CHECKREQS_MEMORY="512M"
CHECKREQS_DISK_BUILD="6G"
check-reqs_pkg_pretend
fi
if ! use gtk; then
ewarn "If you want the LibreOffice systray quickstarter to work"
ewarn "activate the 'gtk' use flag."

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/passepartout/passepartout-0.7.0.ebuild,v 1.5 2012/03/25 20:07:19 floppym Exp $
# $Header: /var/cvsroot/gentoo-x86/app-office/passepartout/passepartout-0.7.0.ebuild,v 1.6 2012/04/02 16:43:56 ago Exp $
EAPI=2
@ -12,7 +12,7 @@ HOMEPAGE="http://www.stacken.kth.se/project/pptout/"
IUSE="gnome"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~x86 ~amd64"
KEYWORDS="amd64 ~x86"
COMMON_DEPS="dev-cpp/libxmlpp:2.6
>=dev-libs/libxml2-2

@ -1,4 +1,2 @@
DIST libgdamm-4.1.3.tar.xz 1454864 RMD160 369ad1cdef3e773a25f287406206f2b4db432b58 SHA1 f6126d7b46720e3ea4f3d49e03add2e52da233be SHA256 9e7c04544fb580d8b00216ca191ab863dff73abec0e569159f4aa640f6319881
DIST libgdamm-4.99.4.1.tar.xz 1362924 RMD160 2e1ff5274c299ac79b24e2c45e90a844dab62a06 SHA1 a67cdf8e9c553e179cb418b938d9d15da0511908 SHA256 7be24b0a7e992724478abda029974f7200a8ef000b8592659dd5068f47b02c6a
DIST libgdamm-4.99.5.tar.xz 1357492 RMD160 ef972e952202acf6dd4ec4568032ab223df955ff SHA1 c0b30c2a8fab095d6b9e571edee1380b33731aba SHA256 1a78c145eaac431684a7822234f0a5ffad69949feb7fbf8017353478621e5db4
DIST libgdamm-4.99.6.tar.xz 1356632 RMD160 a6f088c3016941fa5a1c15c4700a0816f7308803 SHA1 ec3fe4ceb364781dfcca8b0973a8f09bcacbda6f SHA256 d1b7e5101c192695e1fad96f6371d4c2362adb3e8f452f2cb2c89e4380d4f492

@ -1,29 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libgdamm/libgdamm-4.99.4.1.ebuild,v 1.1 2011/10/15 23:56:23 pacho Exp $
EAPI="4"
GNOME2_LA_PUNT="yes"
GCONF_DEBUG="no"
inherit gnome2
DESCRIPTION="C++ bindings for libgda"
HOMEPAGE="http://www.gtkmm.org"
LICENSE="LGPL-2.1"
SLOT="5"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE="berkdb doc"
RDEPEND=">=dev-cpp/glibmm-2.27.93:2
>=gnome-extra/libgda-4.99.3:5[berkdb=]"
DEPEND="${RDEPEND}
dev-util/pkgconfig
doc? ( app-doc/doxygen )"
pkg_setup() {
# Automagic libgda-berkdb support
DOCS="AUTHORS ChangeLog NEWS README TODO"
G2CONF="${G2CONF} $(use_enable doc documentation)"
}

@ -1,29 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libgdamm/libgdamm-4.99.5.ebuild,v 1.1 2011/11/20 15:56:21 pacho Exp $
EAPI="4"
GNOME2_LA_PUNT="yes"
GCONF_DEBUG="no"
inherit gnome2
DESCRIPTION="C++ bindings for libgda"
HOMEPAGE="http://www.gtkmm.org"
LICENSE="LGPL-2.1"
SLOT="5"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE="berkdb doc"
RDEPEND=">=dev-cpp/glibmm-2.27.93:2
>=gnome-extra/libgda-4.99.5:5[berkdb=]"
DEPEND="${RDEPEND}
dev-util/pkgconfig
doc? ( app-doc/doxygen )"
pkg_setup() {
# Automagic libgda-berkdb support
DOCS="AUTHORS ChangeLog NEWS README TODO"
G2CONF="${G2CONF} $(use_enable doc documentation)"
}

@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.10.ebuild,v 1.1 2010/11/17 23:13:29 xmw Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.10.ebuild,v 1.2 2012/04/03 03:12:04 vapier Exp $
EAPI=2
@ -8,18 +8,18 @@ inherit eutils
DESCRIPTION="AVR Downloader/UploaDEr"
HOMEPAGE="http://savannah.nongnu.org/projects/avrdude"
SRC_URI_BASE="http://savannah.nongnu.org/download/${PN}"
SRC_URI="${SRC_URI_BASE}/${P}.tar.gz
doc? ( ${SRC_URI_BASE}/${PN}-doc-${PV}.tar.gz
${SRC_URI_BASE}/${PN}-doc-${PV}.pdf )"
SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
doc? (
mirror://nongnu/${PN}/${PN}-doc-${PV}.tar.gz
mirror://nongnu/${PN}/${PN}-doc-${PV}.pdf
)"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~arm ~amd64 ~ppc ~ppc64 ~x86"
IUSE="doc"
RDEPEND="virtual/libusb"
RDEPEND="virtual/libusb:0"
DEPEND="${RDEPEND}"
src_prepare() {

@ -1,22 +1,23 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.11.1.ebuild,v 1.1 2011/09/21 04:29:31 radhermit Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.11.1.ebuild,v 1.2 2012/04/03 03:12:04 vapier Exp $
EAPI=4
DESCRIPTION="AVR Downloader/UploaDEr"
HOMEPAGE="http://savannah.nongnu.org/projects/avrdude"
SRC_URI_BASE="http://savannah.nongnu.org/download/${PN}"
SRC_URI="${SRC_URI_BASE}/${P}.tar.gz
doc? ( ${SRC_URI_BASE}/${PN}-doc-${PV}.tar.gz
${SRC_URI_BASE}/${PN}-doc-${PV}.pdf )"
SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
doc? (
mirror://nongnu/${PN}/${PN}-doc-${PV}.tar.gz
mirror://nongnu/${PN}/${PN}-doc-${PV}.pdf
)"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~arm ~amd64 ~ppc ~ppc64 ~x86"
IUSE="doc"
RDEPEND="virtual/libusb"
RDEPEND="virtual/libusb:0"
DEPEND="${RDEPEND}"
DOCS="AUTHORS ChangeLog* NEWS README"
@ -27,8 +28,8 @@ src_prepare() {
}
src_compile() {
# The automake target for these files does not use tempfiles or create these
# atomically, confusing a parallel build. So we force them first.
# The automake target for these files does not use tempfiles or create
# these atomically, confusing a parallel build. So we force them first.
emake lexer.c config_gram.c config_gram.h
emake
}

@ -1,15 +1,16 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.11.ebuild,v 1.1 2011/09/02 08:15:35 radhermit Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.11.ebuild,v 1.2 2012/04/03 03:12:04 vapier Exp $
EAPI=4
DESCRIPTION="AVR Downloader/UploaDEr"
HOMEPAGE="http://savannah.nongnu.org/projects/avrdude"
SRC_URI_BASE="http://savannah.nongnu.org/download/${PN}"
SRC_URI="${SRC_URI_BASE}/${P}.tar.gz
doc? ( ${SRC_URI_BASE}/${PN}-doc-${PV}.tar.gz
${SRC_URI_BASE}/${PN}-doc-${PV}.pdf )"
SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
doc? (
mirror://nongnu/${PN}/${PN}-doc-${PV}.tar.gz
mirror://nongnu/${PN}/${PN}-doc-${PV}.pdf
)"
LICENSE="GPL-2"
SLOT="0"
@ -27,8 +28,8 @@ src_prepare() {
}
src_compile() {
# The automake target for these files does not use tempfiles or create these
# atomically, confusing a parallel build. So we force them first.
# The automake target for these files does not use tempfiles or create
# these atomically, confusing a parallel build. So we force them first.
emake lexer.c config_gram.c config_gram.h
emake
}

@ -1,19 +1,19 @@
# Copyright 1999-2008 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.4.ebuild,v 1.6 2008/05/13 08:35:05 calchan Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.4.ebuild,v 1.7 2012/04/03 03:12:04 vapier Exp $
DESCRIPTION="AVR Downloader/UploaDEr"
HOMEPAGE="http://savannah.nongnu.org/projects/avrdude"
SRC_URI="http://savannah.nongnu.org/download/avrdude/${P}.tar.gz"
SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ppc ppc64 x86"
IUSE="doc"
RDEPEND="sys-libs/readline
sys-libs/ncurses
dev-libs/libusb"
<dev-libs/libusb-1"
DEPEND="doc? ( app-text/texi2html
virtual/latex-base
sys-apps/texinfo )

@ -1,19 +1,21 @@
# Copyright 1999-2010 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.5.ebuild,v 1.5 2010/02/28 19:56:30 solar Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.5.ebuild,v 1.6 2012/04/03 03:12:04 vapier Exp $
DESCRIPTION="AVR Downloader/UploaDEr"
HOMEPAGE="http://savannah.nongnu.org/projects/avrdude"
SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz
!doc? ( http://savannah.nongnu.org/download/${PN}/${PN}-doc-${PV}.tar.gz
http://savannah.nongnu.org/download/${PN}/${PN}-doc-${PV}.pdf )"
SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
!doc? (
mirror://nongnu/${PN}/${PN}-doc-${PV}.tar.gz
mirror://nongnu/${PN}/${PN}-doc-${PV}.pdf
)"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="arm amd64 ~ppc ~ppc64 x86"
IUSE="doc"
RDEPEND="dev-libs/libusb"
RDEPEND="<dev-libs/libusb-1"
DEPEND="${RDEPEND}
doc? ( app-text/texi2html
virtual/latex-base

@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.8-r1.ebuild,v 1.1 2010/11/17 22:59:51 xmw Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.8-r1.ebuild,v 1.2 2012/04/03 03:12:04 vapier Exp $
EAPI=2
@ -8,18 +8,18 @@ inherit eutils
DESCRIPTION="AVR Downloader/UploaDEr"
HOMEPAGE="http://savannah.nongnu.org/projects/avrdude"
SRC_URI_BASE="http://savannah.nongnu.org/download/${PN}"
SRC_URI="${SRC_URI_BASE}/${P}.tar.gz
doc? ( ${SRC_URI_BASE}/${PN}-doc-${PV}.tar.gz
${SRC_URI_BASE}/${PN}-doc-${PV}.pdf )"
SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
doc? (
mirror://nongnu/${PN}/${PN}-doc-${PV}.tar.gz
mirror://nongnu/${PN}/${PN}-doc-${PV}.pdf
)"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~arm ~amd64 ~ppc ~ppc64 ~x86"
IUSE="doc"
RDEPEND="virtual/libusb"
RDEPEND="virtual/libusb:0"
DEPEND="${RDEPEND}"
src_prepare() {

@ -1,23 +1,23 @@
# Copyright 1999-2009 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.8.ebuild,v 1.1 2009/12/27 23:18:30 robbat2 Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.8.ebuild,v 1.2 2012/04/03 03:12:04 vapier Exp $
EAPI=2
DESCRIPTION="AVR Downloader/UploaDEr"
HOMEPAGE="http://savannah.nongnu.org/projects/avrdude"
SRC_URI_BASE="http://savannah.nongnu.org/download/${PN}"
SRC_URI="${SRC_URI_BASE}/${P}.tar.gz
doc? ( ${SRC_URI_BASE}/${PN}-doc-${PV}.tar.gz
${SRC_URI_BASE}/${PN}-doc-${PV}.pdf )"
SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
doc? (
mirror://nongnu/${PN}/${PN}-doc-${PV}.tar.gz
mirror://nongnu/${PN}/${PN}-doc-${PV}.pdf
)"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~arm ~amd64 ~ppc ~ppc64 ~x86"
IUSE="doc"
RDEPEND="virtual/libusb"
RDEPEND="virtual/libusb:0"
DEPEND="${RDEPEND}"
src_prepare() {

@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/qvfb/qvfb-4.6.3.ebuild,v 1.3 2010/12/12 10:03:11 tomka Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/qvfb/qvfb-4.6.3.ebuild,v 1.4 2012/04/02 20:33:44 pacho Exp $
EAPI="2"
inherit qt4-build
@ -29,7 +29,7 @@ src_configure() {
-no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng
-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
-no-xmlpatterns -no-freetype -no-libtiff -no-accessibility
-no-glib -no-opengl -no-qt3support -no-svg"
-no-glib -no-qt3support -no-svg"
qt4-build_src_configure
}

@ -1 +1 @@
DIST base-unicode-symbols-0.2.2.2.tar.gz 5549 RMD160 d674bdc90fe05a3e54a94f82d307df388f7d9b06 SHA1 dd68f26b87364a6b72e435b90c33cc19c9e506f4 SHA256 688d89faa433a3486b04997ec9cd298ee54d4524c06784577967f291012a768d
DIST base-unicode-symbols-0.2.2.3.tar.gz 5549 RMD160 095596306b9ea34b1d66f0b719fd75525fc75067 SHA1 ad2d80d309fb975db6647207fc3f757bfb223bd4 SHA256 1201fcc936cf4328153d9ac7e20f797d904ac14ed6493689ddb1cfe61bb30320

@ -1,8 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.2.2.ebuild,v 1.1 2011/12/04 18:04:10 slyfox Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.2.3.ebuild,v 1.1 2012/04/02 17:02:03 slyfox Exp $
# ebuild generated by hackport 0.2.13
# ebuild generated by hackport 0.2.14
EAPI="3"

@ -1,7 +1,3 @@
DIST v8-3.7.12.28.tar.bz2 9831671 RMD160 e91fe64c1852a8635b593fdf6fd4b7d3b330e188 SHA1 58be4a04cf1aacca21003f0288fe277654b32eb3 SHA256 e14d8fa0f514622e2e499f35cdbec0f4fd0ce85ea42850d6a9b542e0493191ab
DIST v8-3.7.12.29.tar.bz2 9832177 RMD160 52c59475a1b21e43223ee138ff58019d9a0e782c SHA1 64e42b8b294f6ba75ade844c20b3eb8851930819 SHA256 aa237cecd4250ddd2a7b9578f288368a34ec70650e2b22a11c0a9a9828c79452
DIST v8-3.7.12.31.tar.bz2 9836220 RMD160 e1e1c130a94d8eacc7eca6bf1a5be43ec9476cf8 SHA1 ecbfc332cd23a719ece95bf9248049994e46aebf SHA256 c2bdca05938b042b55fca8fec4befd7b5c679a98f66095b79c547632a62a3398
DIST v8-3.8.9.15.tar.bz2 9866378 RMD160 67303d23f1edb939ec35acfed319df92319d02f2 SHA1 d6bd63d3ba6ac31116269fe6012dce96afdcf0bd SHA256 adf62780cc6c2ef41c313a9102cfeaa469eefe725d7bb2e906f8ff558f162455
DIST v8-3.8.9.16.tar.bz2 9863957 RMD160 9a9c4133db4b3a1767dfde5fb15960f7c80d6f48 SHA1 a0f66148665b36ec8817c7ce78fa785ae76d63fb SHA256 e653e9f4731a16881742c648a4d5d70d2f4f88919247dd4e08e7bff95e7187b4
DIST v8-3.9.13.tar.bz2 9909229 RMD160 86980c1b00ecb18be4837607c71feb1951d5a824 SHA1 aa8fdbc8396bc06b761b8a33cd4815bd908b489e SHA256 a89d99fe4bc4987b6d3a78ba60bce1345c6bf470c66776dd0a9496acc2abff80
DIST v8-3.9.23.tar.bz2 9966229 RMD160 86a665c5d126b8c879d5bf8851764e7535fb25c5 SHA1 6c0453f07ec5cda4e36d196b302c7c0be27c03df SHA256 9c69e50b03f21b83b56db4fda94ef906023ec9269918f3dc07269188964e237d
DIST v8-3.9.24.1.tar.bz2 9970886 RMD160 c35ed9bef53e4004ad38da623de6ba3438542e6c SHA1 844ce87eec73f93cee3e918ec71a16676f93f829 SHA256 58129d75ffa9ffc34d1236c80c592275597732fc076acc981cf3f38eb14fa206

@ -1,129 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.7.12.28.ebuild,v 1.4 2012/03/24 10:33:08 phajdan.jr Exp $
EAPI="4"
PYTHON_DEPEND="2:2.6"
inherit eutils multilib pax-utils python toolchain-funcs
DESCRIPTION="Google's open source JavaScript engine"
HOMEPAGE="http://code.google.com/p/v8"
SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 x86 ~x64-macos ~x86-macos"
IUSE=""
pkg_pretend() {
local gccver=$(gcc-fullversion)
if [[ ${gccver} = 4.5.2 ]]; then
eerror "The currently selected version of gcc is known to segfault when building this"
eerror "version of V8. Please use at least gcc-4.5.3."
die "gcc-${gccver} detected."
fi
}
pkg_setup() {
python_set_active_version 2
python_pkg_setup
}
src_compile() {
tc-export AR CC CXX RANLIB
export LINK="${CXX}"
# Use target arch detection logic from bug #354601.
case ${CHOST} in
i?86-*) myarch=ia32 ;;
x86_64-*)
if [[ $ABI = x86 ]] ; then
myarch=ia32
else
myarch=x64
fi ;;
arm*-*) myarch=arm ;;
*) die "Unrecognized CHOST: ${CHOST}"
esac
mytarget=${myarch}.release
soname_version="${PV}"
local snapshot=on
host-is-pax && snapshot=off
# TODO: Add console=readline option once implemented upstream
# http://code.google.com/p/v8/issues/detail?id=1781
emake V=1 \
library=shared \
werror=no \
soname_version=${soname_version} \
snapshot=${snapshot} \
${mytarget} || die
pax-mark m out/${mytarget}/{cctest,d8,shell} || die
}
src_test() {
local arg testjobs
for arg in ${MAKEOPTS}; do
case ${arg} in
-j*) testjobs=${arg#-j} ;;
--jobs=*) testjobs=${arg#--jobs=} ;;
esac
done
tools/test-wrapper-gypbuild.py \
-j${testjobs:-1} \
--arch-and-mode=${mytarget} \
--no-presubmit \
--progress=dots || die
}
src_install() {
insinto /usr
doins -r include || die
dobin out/${mytarget}/d8 || die
if [[ ${CHOST} == *-darwin* ]] ; then
install_name_tool \
-id "${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname).${soname_version} \
out/${mytarget}/lib.target/libv8$(get_libname).${soname_version} || die
fi
dolib out/${mytarget}/lib.target/libv8$(get_libname).${soname_version} || die
dosym libv8$(get_libname).${soname_version} /usr/$(get_libdir)/libv8$(get_libname) || die
dodoc AUTHORS ChangeLog || die
}
pkg_preinst() {
preserved_libs=()
local baselib candidate
eshopts_push -s nullglob
for candidate in "${EROOT}usr/$(get_libdir)"/libv8-*$(get_libname) \
"${EROOT}usr/$(get_libdir)"/libv8$(get_libname).*; do
baselib=${candidate##*/}
if [[ ! -e "${ED}usr/$(get_libdir)/${baselib}" ]]; then
preserved_libs+=( "${EPREFIX}/usr/$(get_libdir)/${baselib}" )
fi
done
eshopts_pop
if [[ ${#preserved_libs[@]} -gt 0 ]]; then
preserve_old_lib "${preserved_libs[@]}"
fi
}
pkg_postinst() {
if [[ ${#preserved_libs[@]} -gt 0 ]]; then
preserve_old_lib_notify "${preserved_libs[@]}"
fi
}

@ -1,129 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.7.12.29.ebuild,v 1.3 2012/03/24 10:33:08 phajdan.jr Exp $
EAPI="4"
PYTHON_DEPEND="2:2.6"
inherit eutils multilib pax-utils python toolchain-funcs
DESCRIPTION="Google's open source JavaScript engine"
HOMEPAGE="http://code.google.com/p/v8"
SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 ~x86 ~x64-macos ~x86-macos"
IUSE=""
pkg_pretend() {
local gccver=$(gcc-fullversion)
if [[ ${gccver} = 4.5.2 ]]; then
eerror "The currently selected version of gcc is known to segfault when building this"
eerror "version of V8. Please use at least gcc-4.5.3."
die "gcc-${gccver} detected."
fi
}
pkg_setup() {
python_set_active_version 2
python_pkg_setup
}
src_compile() {
tc-export AR CC CXX RANLIB
export LINK="${CXX}"
# Use target arch detection logic from bug #354601.
case ${CHOST} in
i?86-*) myarch=ia32 ;;
x86_64-*)
if [[ $ABI = x86 ]] ; then
myarch=ia32
else
myarch=x64
fi ;;
arm*-*) myarch=arm ;;
*) die "Unrecognized CHOST: ${CHOST}"
esac
mytarget=${myarch}.release
soname_version="${PV}"
local snapshot=on
host-is-pax && snapshot=off
# TODO: Add console=readline option once implemented upstream
# http://code.google.com/p/v8/issues/detail?id=1781
emake V=1 \
library=shared \
werror=no \
soname_version=${soname_version} \
snapshot=${snapshot} \
${mytarget} || die
pax-mark m out/${mytarget}/{cctest,d8,shell} || die
}
src_test() {
local arg testjobs
for arg in ${MAKEOPTS}; do
case ${arg} in
-j*) testjobs=${arg#-j} ;;
--jobs=*) testjobs=${arg#--jobs=} ;;
esac
done
tools/test-wrapper-gypbuild.py \
-j${testjobs:-1} \
--arch-and-mode=${mytarget} \
--no-presubmit \
--progress=dots || die
}
src_install() {
insinto /usr
doins -r include || die
dobin out/${mytarget}/d8 || die
if [[ ${CHOST} == *-darwin* ]] ; then
install_name_tool \
-id "${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname).${soname_version} \
out/${mytarget}/lib.target/libv8$(get_libname).${soname_version} || die
fi
dolib out/${mytarget}/lib.target/libv8$(get_libname).${soname_version} || die
dosym libv8$(get_libname).${soname_version} /usr/$(get_libdir)/libv8$(get_libname) || die
dodoc AUTHORS ChangeLog || die
}
pkg_preinst() {
preserved_libs=()
local baselib candidate
eshopts_push -s nullglob
for candidate in "${EROOT}usr/$(get_libdir)"/libv8-*$(get_libname) \
"${EROOT}usr/$(get_libdir)"/libv8$(get_libname).*; do
baselib=${candidate##*/}
if [[ ! -e "${ED}usr/$(get_libdir)/${baselib}" ]]; then
preserved_libs+=( "${EPREFIX}/usr/$(get_libdir)/${baselib}" )
fi
done
eshopts_pop
if [[ ${#preserved_libs[@]} -gt 0 ]]; then
preserve_old_lib "${preserved_libs[@]}"
fi
}
pkg_postinst() {
if [[ ${#preserved_libs[@]} -gt 0 ]]; then
preserve_old_lib_notify "${preserved_libs[@]}"
fi
}

@ -1,129 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.7.12.31.ebuild,v 1.2 2012/03/24 10:33:08 phajdan.jr Exp $
EAPI="4"
PYTHON_DEPEND="2:2.6"
inherit eutils multilib pax-utils python toolchain-funcs
DESCRIPTION="Google's open source JavaScript engine"
HOMEPAGE="http://code.google.com/p/v8"
SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~x64-macos ~x86-macos"
IUSE=""
pkg_pretend() {
local gccver=$(gcc-fullversion)
if [[ ${gccver} = 4.5.2 ]]; then
eerror "The currently selected version of gcc is known to segfault when building this"
eerror "version of V8. Please use at least gcc-4.5.3."
die "gcc-${gccver} detected."
fi
}
pkg_setup() {
python_set_active_version 2
python_pkg_setup
}
src_compile() {
tc-export AR CC CXX RANLIB
export LINK="${CXX}"
# Use target arch detection logic from bug #354601.
case ${CHOST} in
i?86-*) myarch=ia32 ;;
x86_64-*)
if [[ $ABI = x86 ]] ; then
myarch=ia32
else
myarch=x64
fi ;;
arm*-*) myarch=arm ;;
*) die "Unrecognized CHOST: ${CHOST}"
esac
mytarget=${myarch}.release
soname_version="${PV}"
local snapshot=on
host-is-pax && snapshot=off
# TODO: Add console=readline option once implemented upstream
# http://code.google.com/p/v8/issues/detail?id=1781
emake V=1 \
library=shared \
werror=no \
soname_version=${soname_version} \
snapshot=${snapshot} \
${mytarget} || die
pax-mark m out/${mytarget}/{cctest,d8,shell} || die
}
src_test() {
local arg testjobs
for arg in ${MAKEOPTS}; do
case ${arg} in
-j*) testjobs=${arg#-j} ;;
--jobs=*) testjobs=${arg#--jobs=} ;;
esac
done
tools/test-wrapper-gypbuild.py \
-j${testjobs:-1} \
--arch-and-mode=${mytarget} \
--no-presubmit \
--progress=dots || die
}
src_install() {
insinto /usr
doins -r include || die
dobin out/${mytarget}/d8 || die
if [[ ${CHOST} == *-darwin* ]] ; then
install_name_tool \
-id "${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname).${soname_version} \
out/${mytarget}/lib.target/libv8$(get_libname).${soname_version} || die
fi
dolib out/${mytarget}/lib.target/libv8$(get_libname).${soname_version} || die
dosym libv8$(get_libname).${soname_version} /usr/$(get_libdir)/libv8$(get_libname) || die
dodoc AUTHORS ChangeLog || die
}
pkg_preinst() {
preserved_libs=()
local baselib candidate
eshopts_push -s nullglob
for candidate in "${EROOT}usr/$(get_libdir)"/libv8-*$(get_libname) \
"${EROOT}usr/$(get_libdir)"/libv8$(get_libname).*; do
baselib=${candidate##*/}
if [[ ! -e "${ED}usr/$(get_libdir)/${baselib}" ]]; then
preserved_libs+=( "${EPREFIX}/usr/$(get_libdir)/${baselib}" )
fi
done
eshopts_pop
if [[ ${#preserved_libs[@]} -gt 0 ]]; then
preserve_old_lib "${preserved_libs[@]}"
fi
}
pkg_postinst() {
if [[ ${#preserved_libs[@]} -gt 0 ]]; then
preserve_old_lib_notify "${preserved_libs[@]}"
fi
}

@ -1,149 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.8.9.15.ebuild,v 1.2 2012/03/24 10:33:08 phajdan.jr Exp $
EAPI="4"
PYTHON_DEPEND="2:2.6"
inherit eutils multilib pax-utils python toolchain-funcs versionator
DESCRIPTION="Google's open source JavaScript engine"
HOMEPAGE="http://code.google.com/p/v8"
SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~x64-macos ~x86-macos"
IUSE=""
pkg_pretend() {
local gccver=$(gcc-fullversion)
if [[ ${gccver} = 4.5.2 ]]; then
eerror "The currently selected version of gcc is known to segfault when building this"
eerror "version of V8. Please use at least gcc-4.5.3."
die "gcc-${gccver} detected."
fi
}
pkg_setup() {
python_set_active_version 2
python_pkg_setup
}
src_prepare() {
# don't force 32-bits mode on Darwin
sed -i -e '/-arch i386/d' build/gyp/pylib/gyp/generator/make.py || die
# force using Makefiles, instead of Xcode project file on Darwin
sed -i -e '/darwin/s/xcode/make/' build/gyp/pylib/gyp/__init__.py || die
# don't refuse to build shared_libs because we build somewhere else
sed -i \
-e '/params\.get.*mac.*darwin.*linux/s/mac/darwin/' \
-e "/if GetFlavor(params) == 'mac':/s/mac/darwin/" \
-e "/^ if flavor == 'mac':/s/mac/darwin/" \
build/gyp/pylib/gyp/generator/make.py || die
# make sure our v8.dylib doesn't end up being empty and give it a proper
# install_name (soname)
sed -i \
-e '/^LINK_COMMANDS_MAC =/,/^SHARED_HEADER =/s#-shared#-dynamiclib -all_load -install_name '"${EPREFIX}/usr/$(get_libdir)/libv8$(get_libname $(get_version_component_range 1-3))"'#' \
build/gyp/pylib/gyp/generator/make.py || die
# don't force targetting old machines
sed -i -e "s/, '-mmacosx-version-min=10.4'//" SConstruct || die
}
src_compile() {
tc-export AR CC CXX RANLIB
export LINK="${CXX}"
# Use target arch detection logic from bug #354601.
case ${CHOST} in
i?86-*) myarch=ia32 ;;
x86_64-*)
if [[ $ABI = x86 ]] ; then
myarch=ia32
else
myarch=x64
fi ;;
arm*-*) myarch=arm ;;
*) die "Unrecognized CHOST: ${CHOST}"
esac
mytarget=${myarch}.release
soname_version="$(get_version_component_range 1-3)"
local snapshot=on
host-is-pax && snapshot=off
# TODO: Add console=readline option once implemented upstream
# http://code.google.com/p/v8/issues/detail?id=1781
emake V=1 \
library=shared \
werror=no \
soname_version=${soname_version} \
snapshot=${snapshot} \
${mytarget} || die
pax-mark m out/${mytarget}/{cctest,d8,shell} || die
}
src_test() {
local arg testjobs
for arg in ${MAKEOPTS}; do
case ${arg} in
-j*) testjobs=${arg#-j} ;;
--jobs=*) testjobs=${arg#--jobs=} ;;
esac
done
tools/test-wrapper-gypbuild.py \
-j${testjobs:-1} \
--arch-and-mode=${mytarget} \
--no-presubmit \
--progress=dots || die
}
src_install() {
insinto /usr
doins -r include || die
dobin out/${mytarget}/d8 || die
if [[ ${CHOST} == *-darwin* ]] ; then
# buildsystem is too horrific to get this built correctly
mv out/${mytarget}/lib.target/libv8.so.${soname_version} \
out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die
fi
dolib out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die
dosym libv8$(get_libname ${soname_version}) /usr/$(get_libdir)/libv8$(get_libname) || die
dodoc AUTHORS ChangeLog || die
}
pkg_preinst() {
preserved_libs=()
local baselib candidate
eshopts_push -s nullglob
for candidate in "${EROOT}usr/$(get_libdir)"/libv8-*$(get_libname) \
"${EROOT}usr/$(get_libdir)"/libv8$(get_libname).*; do
baselib=${candidate##*/}
if [[ ! -e "${ED}usr/$(get_libdir)/${baselib}" ]]; then
preserved_libs+=( "${EPREFIX}/usr/$(get_libdir)/${baselib}" )
fi
done
eshopts_pop
if [[ ${#preserved_libs[@]} -gt 0 ]]; then
preserve_old_lib "${preserved_libs[@]}"
fi
}
pkg_postinst() {
if [[ ${#preserved_libs[@]} -gt 0 ]]; then
preserve_old_lib_notify "${preserved_libs[@]}"
fi
}

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.9.13.ebuild,v 1.2 2012/03/24 10:33:08 phajdan.jr Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.9.24.1.ebuild,v 1.1 2012/04/02 12:47:18 phajdan.jr Exp $
EAPI="4"

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/libaio-0.3.109-r3.ebuild,v 1.6 2012/03/30 13:37:45 haubi Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/libaio-0.3.109-r3.ebuild,v 1.7 2012/04/02 20:11:18 pacho Exp $
EAPI=3
@ -65,6 +65,8 @@ src_prepare() {
-e '/:=.*strip.*shell.*git/s:=.*:=:' \
"${extra_sed[@]}" \
src/Makefile Makefile || die
sed -i -e "s:-Werror::g" harness/Makefile || die
done
ABI=${OABI}
}

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdnet/libdnet-1.11-r2.ebuild,v 1.3 2012/02/16 15:05:39 jer Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdnet/libdnet-1.11-r2.ebuild,v 1.4 2012/04/02 09:33:07 naota Exp $
EAPI=4
PYTHON_DEPEND="python? 2"
@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/libdnet/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="python static-libs"
RESTRICT="test"

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/quazip/quazip-0.4.4.ebuild,v 1.2 2012/02/19 09:10:02 klausman Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-libs/quazip/quazip-0.4.4.ebuild,v 1.3 2012/04/02 16:39:45 ago Exp $
EAPI=4
@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
KEYWORDS="~alpha amd64 ~arm ~hppa ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE=""
DEPEND="

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Apache-AuthCookie/Apache-AuthCookie-3.180.0.ebuild,v 1.1 2011/09/01 13:50:02 tove Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Apache-AuthCookie/Apache-AuthCookie-3.180.0.ebuild,v 1.2 2012/04/02 16:41:43 ago Exp $
EAPI=4
@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Perl Authentication and Authorization via cookies"
SLOT="0"
KEYWORDS="~amd64 ~ia64 ~x86"
KEYWORDS="amd64 ~ia64 ~x86"
IUSE=""
RDEPEND=">=www-apache/mod_perl-2

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-Parser/XML-Parser-2.410.0.ebuild,v 1.2 2011/07/30 10:46:52 tove Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-Parser/XML-Parser-2.410.0.ebuild,v 1.3 2012/04/02 16:44:22 ago Exp $
EAPI=4
@ -11,7 +11,7 @@ inherit perl-module multilib
DESCRIPTION="A Perl extension interface to James Clark's XML parser, expat"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=dev-libs/expat-1.95.1-r1"

@ -1,3 +1,4 @@
DIST pecl_http-1.7.0.tgz 173979 RMD160 5bace9bc7bf12ba66f17a47dedf8ffe31a12a73a SHA1 b63ede760f47d487309e745334aa764f3e70f883 SHA256 86112fe9dda0237e72b9b74da7767532961b5212731068fffde469e789e72be7
DIST pecl_http-1.7.1.tgz 174098 RMD160 4039d5e76962599d46910c129c757951b3611b8f SHA1 898635c9606433a9d1f800f9e461e236b6fd76bf SHA256 e6f6ee2e1d724486fbc6e9c8f54fe1751309422c704e6f727af342ee499458f2
DIST pecl_http-1.7.3.tgz 174462 RMD160 23cbe1add5188e05feb108fca05f0ae2e60099dd SHA1 679bed7f065617c66171e5aea7b1ede9b36fd213 SHA256 f7f97eea3344e735918b4ce0e87a2f457a8fc53579e519fd2fc0850c854cfa4e
DIST pecl_http-1.7.4.tgz 174503 RMD160 f5a80df53a13a16a218e5057c705596821fb97c0 SHA1 3a2276c765fccb58ae0a96e71bde26657952d139 SHA256 9006122f45a96754a417fd5afb00a7b6ad1aa125dd2158e56ca1b2d334421e03

@ -0,0 +1,61 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-http/pecl-http-1.7.4.ebuild,v 1.1 2012/04/02 11:25:08 olemarkus Exp $
EAPI="4"
PHP_EXT_NAME="http"
PHP_EXT_PECL_PKG="pecl_http"
PHP_EXT_INI="yes"
PHP_EXT_ZENDEXT="no"
DOCS="docs/examples/tutorial.txt ThanksTo.txt KnownIssues.txt"
USE_PHP="php5-3 php5-4"
inherit php-ext-pecl-r2 php-ext-source-r2
KEYWORDS="~amd64 ~x86"
DESCRIPTION="Extended HTTP Support for PHP."
LICENSE="BSD-2 MIT"
SLOT="0"
IUSE=""
DEPEND=">=net-misc/curl-7.19.4
sys-libs/zlib
dev-libs/libevent
>=dev-lang/php-5[hash,session,iconv]
"
RDEPEND="${DEPEND}"
my_conf="--enable-http \
--with-http-curl-requests \
--with-http-zlib-compression \
--with-http-curl-libevent \
--with-http-magic-mime"
src_install() {
php-ext-pecl-r2_src_install
php-ext-source-r2_addtoinifiles "http.etag.mode" "MD5"
php-ext-source-r2_addtoinifiles "http.force_exit" "1"
php-ext-source-r2_addtoinifiles "http.log.allowed_methods" ""
php-ext-source-r2_addtoinifiles "http.log.cache" ""
php-ext-source-r2_addtoinifiles "http.log.composite" ""
php-ext-source-r2_addtoinifiles "http.log.not_found" ""
php-ext-source-r2_addtoinifiles "http.log.redirect" ""
php-ext-source-r2_addtoinifiles "http.only_exceptions" "0"
php-ext-source-r2_addtoinifiles "http.persistent.handles.ident" "GLOBAL"
php-ext-source-r2_addtoinifiles "http.persistent.handles.limit" "-1"
php-ext-source-r2_addtoinifiles "http.request.datashare.connect" "0"
php-ext-source-r2_addtoinifiles "http.request.datashare.cookie" "0"
php-ext-source-r2_addtoinifiles "http.request.datashare.dns" "1"
php-ext-source-r2_addtoinifiles "http.request.datashare.ssl" "0"
php-ext-source-r2_addtoinifiles "http.request.methods.allowed" ""
php-ext-source-r2_addtoinifiles "http.request.methods.custom" ""
php-ext-source-r2_addtoinifiles "http.send.inflate.start_auto" "0"
php-ext-source-r2_addtoinifiles "http.send.inflate.start_flags" "0"
php-ext-source-r2_addtoinifiles "http.send.deflate.start_auto" "0"
php-ext-source-r2_addtoinifiles "http.send.deflate.start_flags" "0"
php-ext-source-r2_addtoinifiles "http.send.not_found_404" "1"
}

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/pypcap/pypcap-1.1-r1.ebuild,v 1.7 2012/02/22 06:42:03 patrick Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/pypcap/pypcap-1.1-r1.ebuild,v 1.8 2012/04/02 10:21:13 naota Exp $
EAPI="3"
PYTHON_DEPEND="2"
@ -15,7 +15,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="~amd64 ~x86 ~x86-fbsd"
IUSE="examples"
RDEPEND="net-libs/libpcap"

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/pyquery/pyquery-1.1.1.ebuild,v 1.4 2012/03/18 15:06:30 armin76 Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/pyquery/pyquery-1.1.1.ebuild,v 1.5 2012/04/02 11:20:34 naota Exp $
EAPI=3
@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86"
KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd"
IUSE="test"
RDEPEND=">=dev-python/lxml-2.1"

@ -0,0 +1,20 @@
rdflib/__init__.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/rdflib/__init__.py b/rdflib/__init__.py
index b781031..44efb0b 100644
--- a/rdflib/__init__.py
+++ b/rdflib/__init__.py
@@ -15,10 +15,10 @@ A tiny example:
>>> import rdflib
>>> g = rdflib.Graph()
- >>> result = g.parse("http://eikeon.com/foaf.rdf")
+ >>> result = g.parse("http://www.w3.org/2000/10/swap/test/meet/white.rdf")
>>> print "graph has %s statements." % len(g)
- graph has 34 statements.
+ graph has 19 statements.
>>>
>>> for s, p, o in g:
... if (s, p, o) not in g:

@ -1,13 +1,13 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/rdflib/rdflib-3.1.0.ebuild,v 1.2 2011/09/12 21:20:56 neurogeek Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/rdflib/rdflib-3.1.0.ebuild,v 1.3 2012/04/02 16:22:20 jlec Exp $
EAPI="3"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.*"
RESTRICT_PYTHON_ABIS="3.* *-pypy-*"
inherit distutils
inherit distutils eutils
DESCRIPTION="RDF library containing a triple store and parser/serializer"
HOMEPAGE="http://www.rdflib.net/ http://pypi.python.org/pypi/rdflib"
@ -25,6 +25,11 @@ RDEPEND="berkdb? ( dev-python/bsddb3 )
DEPEND="${RDEPEND}
test? ( dev-python/nose )"
src_prepare() {
epatch "${FILESDIR}"/${P}-test.patch
distutils_src_prepare
}
src_test() {
testing() {
PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib)" "$(PYTHON)" run_tests.py

@ -0,0 +1,112 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r2.ebuild,v 1.1 2012/04/02 17:08:23 floppym Exp $
EAPI="4"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
DISTUTILS_SRC_TEST="nosetests"
PYTHON_TESTS_RESTRICTED_ABIS="2.5 *-pypy-*"
inherit distutils
MY_PN="Sphinx"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Python documentation generator"
HOMEPAGE="http://sphinx.pocoo.org/ http://pypi.python.org/pypi/Sphinx"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc latex"
DEPEND=">=dev-python/docutils-0.7
>=dev-python/jinja-2.3
>=dev-python/pygments-1.2
dev-python/setuptools
latex? ( dev-texlive/texlive-latexextra )"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${MY_P}"
DOCS="CHANGES"
src_prepare() {
distutils_src_prepare
prepare_tests() {
mkdir -p build-${PYTHON_ABI}
cp -r tests build-${PYTHON_ABI}/tests
if [[ $(python_get_version -l --major) == "3" ]]; then
2to3-${PYTHON_ABI} -nw --no-diffs build-${PYTHON_ABI}/tests
fi
}
use test && python_execute_function prepare_tests
}
src_compile() {
distutils_src_compile
if use doc; then
pushd doc > /dev/null
einfo "Generation of documentation"
PYTHONPATH=".." emake SPHINXBUILD="$(PYTHON -f) ../sphinx-build.py" html || die "Generation of documentation failed"
popd > /dev/null
fi
}
src_test() {
testing() {
pushd build-${PYTHON_ABI} > /dev/null
echo PYTHONPATH=lib nosetests --verbosity=1
PYTHONPATH=lib nosetests --verbosity=1
local rv=$?
rm -f lib/sphinx/pycode/Grammar*.pickle
popd > /dev/null
return $rv
}
python_execute_function testing
}
src_install() {
distutils_src_install
python_generate_wrapper_scripts -E -f -q "${ED}usr/bin/sphinx-build"
if use doc; then
dohtml -A txt -r doc/_build/html/* || die "Installation of documentation failed"
fi
}
pkg_postinst() {
distutils_pkg_postinst
# Generate the Grammar pickle to avoid sandbox violations.
generation_of_grammar_pickle() {
"$(PYTHON)" -c "import sys; sys.path.insert(0, '${EROOT}$(python_get_sitedir -b)'); from sphinx.pycode.pgen2.driver import load_grammar; load_grammar('${EROOT}$(python_get_sitedir -b)/sphinx/pycode/Grammar.txt')"
}
python_execute_function \
--action-message 'Generation of Grammar pickle with $(python_get_implementation_and_version)...' \
--failure-message 'Generation of Grammar pickle with $(python_get_implementation_and_version) failed' \
generation_of_grammar_pickle
}
pkg_postrm() {
distutils_pkg_postrm
deletion_of_grammar_pickle() {
rm -f "${EROOT}$(python_get_sitedir -b)/sphinx/pycode"/Grammar*.pickle || return 1
# Delete empty parent directories.
local dir="${EROOT}$(python_get_sitedir -b)/sphinx/pycode"
while [[ "${dir}" != "${EROOT%/}" ]]; do
rmdir "${dir}" 2> /dev/null || break
dir="${dir%/*}"
done
}
python_execute_function \
--action-message 'Deletion of Grammar pickle with $(python_get_implementation_and_version)...' \
--failure-message 'Deletion of Grammar pickle with $(python_get_implementation_and_version) failed' \
deletion_of_grammar_pickle
}

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/webob/webob-1.1.ebuild,v 1.1 2011/09/16 08:12:12 djc Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/webob/webob-1.1.ebuild,v 1.2 2012/04/02 13:48:25 naota Exp $
EAPI="3"
PYTHON_DEPEND="2"
@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="doc test"
DEPEND="app-arch/unzip

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/webtest/webtest-1.3.ebuild,v 1.5 2012/03/18 15:08:26 armin76 Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/webtest/webtest-1.3.ebuild,v 1.6 2012/04/02 13:25:29 naota Exp $
EAPI="3"
PYTHON_DEPEND="2:2.5"
@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86"
KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd"
IUSE="doc"
RDEPEND=">=dev-python/webob-0.9.2"

@ -1,2 +1,3 @@
DIST meld-1.5.2.tar.xz 326260 RMD160 a6dc1b37ea7e1571eee03deffd1343a7d5de826d SHA1 84af8c5c45a321edb25f676d8796aff9e650ab3d SHA256 bddd8322437fc4d5cf0d17e6f7e85ee273d86275a209640813d0e2451d9e2b17
DIST meld-1.5.3.tar.xz 333016 RMD160 e5d6929e314853043d11ab98dd37b4ad6fc5b887 SHA1 e9858975c0a779efa03d3b236b730f3006601f76 SHA256 a27890202584920db941f78c64ba79662b3cdcf5f90c0d2f140a4b52858229b9
DIST meld-1.5.4.tar.xz 339728 RMD160 256e72eea202ab27c274b5e83031f96e45d1621e SHA1 949e7476d8203fa867f9ea3db25d5b28f2c5488c SHA256 fc6e78dc8cdcff34d14403b1b45dbdf5a8d480e889602cddc0df342b34266612

@ -0,0 +1,90 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.5.4.ebuild,v 1.1 2012/04/02 22:06:51 pacho Exp $
EAPI="4"
GCONF_DEBUG="no"
PYTHON_DEPEND="2:2.5"
inherit python gnome2 eutils multilib
DESCRIPTION="A graphical diff and merge tool"
HOMEPAGE="http://meldmerge.org/"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="doc gnome"
RDEPEND="
>=dev-python/pygtk-2.14:2
>=dev-python/pygobject-2.8:2
gnome? ( >=dev-python/gconf-python-2.22:2 )
"
DEPEND="${RDEPEND}
dev-util/intltool
app-text/scrollkeeper"
pkg_setup() {
DOCS="NEWS"
# Needed for optimizing python modules against proper interpreter
python_set_active_version 2
python_pkg_setup
}
src_prepare() {
gnome2_src_prepare
# fix the prefix so its not in */local/*
sed -e "s:/usr/local:${EPREFIX}/usr:" \
-e "s:\$(prefix)/lib:\$(prefix)/$(get_libdir):" \
-i INSTALL || die "sed 1 failed"
# don't install anything to /usr/share/doc/meld
sed -e "s:\$(docdir)/meld:\$(docdir)/${PF}:" \
-i INSTALL || die "sed 2 failed"
# let the python eclass handle python objects
sed -e '/$(PYTHON) .* .import compileall;/s/\t/&#/g' \
-i Makefile || die "sed 3 failed"
# don't run scrollkeeper (with the wrong path),
# leave that to gnome2.eclass #145833
sed -e '/scrollkeeper-update/s/\t/&#/' \
-i help/*/Makefile || die "sed 4 failed"
# replace all calls to python by specific major version
sed -e "s/\(PYTHON ?= \).*/\1$(PYTHON -2)/" \
-i INSTALL || die "sed 6 failed"
python_convert_shebangs 2 "${S}"/tools/*
strip-linguas -i "${S}/po"
local mylinguas=""
for x in ${LINGUAS}; do
mylinguas="${mylinguas} ${x}.po"
done
if [ -n "${mylinguas}" ]; then
sed -e "s/PO:=.*/PO:=${mylinguas}/" \
-i po/Makefile || die "sed 5 failed"
fi
}
src_configure() {
:
}
src_install() {
gnome2_src_install
python_convert_shebangs 2 "${ED}"usr/bin/meld
}
pkg_postinst() {
gnome2_pkg_postinst
python_mod_optimize /usr/$(get_libdir)/meld
}
pkg_postrm() {
gnome2_pkg_postrm
python_mod_cleanup /usr/$(get_libdir)/meld
}

@ -1,6 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>gnome</herd>
<maintainer>
<email>remi@gentoo.org</email>
<name>Rémi Cardona</name>

@ -0,0 +1,83 @@
From: Paul Jackson <pj@usa.net>, Paul Jackson <thepythoniccow@gmail.com>
xdelta3 (version 3.0.0) has numerous sprintf and strcpy calls that
write into 32 byte char buffers that are on the stack or are static
allocations. With sufficiently large files, these strings can overflow
the 32 char buffers, and some recent gnu libc versions will detect this
and immediately abort with the error "*** buffer overflow detected ***"
This patch, the first of three, is the only essential patch for this fix.
It increases the 32 byte stack buffers to 48 bytes each.
The subsequent two patches will replace sprintf calls with snprintf,
to safely avoid overflowing these stack buffers in all cases, and will
fix a hang caused by not properly closing and flushing pipes.
---
xdelta3-blkcache.h | 10 +++++-----
xdelta3-main.h | 14 +++++++-------
2 files changed, 12 insertions(+), 12 deletions(-)
--- xdelta3.0.0.orig/xdelta3-blkcache.h 2012-03-26 22:55:03.447784216 -0500
+++ xdelta3.0.0/xdelta3-blkcache.h 2012-03-26 23:22:54.871899533 -0500
@@ -233,11 +233,11 @@ main_set_source (xd3_stream *stream, xd3
if (option_verbose)
{
- static char srcszbuf[32];
- static char srccntbuf[32];
- static char winszbuf[32];
- static char blkszbuf[32];
- static char nbufs[32];
+ static char srcszbuf[48];
+ static char srccntbuf[48];
+ static char winszbuf[48];
+ static char blkszbuf[48];
+ static char nbufs[48];
if (sfile->size_known)
{
--- xdelta3.0.0.orig/xdelta3-main.h 2012-03-26 22:55:03.455784458 -0500
+++ xdelta3.0.0/xdelta3-main.h 2012-03-26 23:22:54.859899160 -0500
@@ -633,7 +633,7 @@ static char*
main_format_rate (xoff_t bytes, long millis, char *buf)
{
xoff_t r = (xoff_t)(1.0 * bytes / (1.0 * millis / 1000.0));
- static char lbuf[32];
+ static char lbuf[48];
main_format_bcnt (r, lbuf);
sprintf (buf, "%s/s", lbuf);
@@ -2954,7 +2954,7 @@ static usize_t
main_get_winsize (main_file *ifile) {
xoff_t file_size = 0;
usize_t size = option_winsize;
- static char iszbuf[32];
+ static char iszbuf[48];
if (main_file_stat (ifile, &file_size) == 0)
{
@@ -3328,10 +3328,10 @@ main_input (xd3_cmd cmd,
if (option_verbose)
{
- char rrateavg[32], wrateavg[32], tm[32];
- char rdb[32], wdb[32];
- char trdb[32], twdb[32];
- char srcpos[32];
+ char rrateavg[48], wrateavg[48], tm[48];
+ char rdb[48], wdb[48];
+ char trdb[48], twdb[48];
+ char srcpos[48];
long millis = get_millisecs_since ();
usize_t this_read = (usize_t)(stream.total_in -
last_total_in);
@@ -3460,7 +3460,7 @@ done:
if (option_verbose)
{
- char tm[32];
+ char tm[48];
long end_time = get_millisecs_now ();
xoff_t nwrite = ofile != NULL ? ofile->nwrite : 0;

@ -0,0 +1,226 @@
From: Paul Jackson <pj@usa.net>, Paul Jackson <thepythoniccow@gmail.com>
xdelta3 (version 3.0.0) has numerous sprintf and strcpy calls that
write into 32 byte char buffers that are on the stack or are static
allocations. With sufficiently large files, these strings can overflow
the 32 char buffers, and some recent gnu libc versions will detect this
and immediately abort with the error "*** buffer overflow detected ***"
The first patch in this series increased these buffers from 32 to 48 bytes.
This patch, the second in the series, replaces sprintf calls with
snprintf, to safely avoid overflowing these stack buffers in all cases.
This change necessitated changing the main_format_bcnt() and
main_format_millis() API's, to pass the size of the buffer.
The third patch will fix a hang caused by not properly closing and flushing
pipes.
---
xdelta3-blkcache.h | 12 ++++-----
xdelta3-main.h | 64 ++++++++++++++++++++++++++---------------------------
2 files changed, 38 insertions(+), 38 deletions(-)
--- xdelta3.0.0.orig/xdelta3-blkcache.h 2012-03-26 23:06:12.280521538 -0500
+++ xdelta3.0.0/xdelta3-blkcache.h 2012-03-26 23:06:47.049599301 -0500
@@ -241,27 +241,27 @@ main_set_source (xd3_stream *stream, xd3
if (sfile->size_known)
{
- sprintf (srcszbuf, "source size %s [%"Q"u]",
- main_format_bcnt (source_size, srccntbuf),
+ snprintf (srcszbuf, sizeof(srcszbuf), "source size %s [%"Q"u]",
+ main_format_bcnt (source_size, srccntbuf, sizeof(srccntbuf)),
source_size);
}
else
{
- strcpy(srcszbuf, "source size unknown");
+ strncpy(srcszbuf, "source size unknown", sizeof(srcszbuf));
}
nbufs[0] = 0;
if (option_verbose > 1)
{
- sprintf(nbufs, " #bufs %u", lru_size);
+ snprintf(nbufs, sizeof(nbufs), " #bufs %u", lru_size);
}
XPR(NT "source %s %s blksize %s window %s%s%s\n",
sfile->filename,
srcszbuf,
- main_format_bcnt (blksize, blkszbuf),
- main_format_bcnt (option_srcwinsz, winszbuf),
+ main_format_bcnt (blksize, blkszbuf, sizeof(blkszbuf)),
+ main_format_bcnt (option_srcwinsz, winszbuf, sizeof(winszbuf)),
nbufs,
do_src_fifo ? " (FIFO)" : "");
}
--- xdelta3.0.0.orig/xdelta3-main.h 2012-03-26 23:06:12.296522032 -0500
+++ xdelta3.0.0/xdelta3-main.h 2012-03-26 23:22:32.255191072 -0500
@@ -354,7 +354,7 @@ static int main_read_primary_input (main
usize_t size,
usize_t *nread);
-static const char* main_format_bcnt (xoff_t r, char *buf);
+static const char* main_format_bcnt (xoff_t r, char *buf, int szbuf);
static int main_help (void);
/* The code in xdelta3-blk.h is essentially part of this unit, see
@@ -576,7 +576,7 @@ get_millisecs_since (void)
}
static const char*
-main_format_bcnt (xoff_t r, char *buf)
+main_format_bcnt (xoff_t r, char *buf, int szbuf)
{
static const char* fmts[] = { "B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB" };
usize_t i;
@@ -587,25 +587,25 @@ main_format_bcnt (xoff_t r, char *buf)
if (r == 0)
{
- sprintf (buf, "0 %s", fmts[i]);
+ snprintf (buf, szbuf, "0 %s", fmts[i]);
return buf;
}
if (r >= 1 && r < 10)
{
- sprintf (buf, "%.2f %s", (double) r, fmts[i]);
+ snprintf (buf, szbuf, "%.2f %s", (double) r, fmts[i]);
return buf;
}
if (r >= 10 && r < 100)
{
- sprintf (buf, "%.1f %s", (double) r, fmts[i]);
+ snprintf (buf, szbuf, "%.1f %s", (double) r, fmts[i]);
return buf;
}
if (r >= 100 && r < 1000)
{
- sprintf (buf, "%"Q"u %s", r, fmts[i]);
+ snprintf (buf, szbuf, "%"Q"u %s", r, fmts[i]);
return buf;
}
@@ -613,13 +613,13 @@ main_format_bcnt (xoff_t r, char *buf)
if (new_r < 10)
{
- sprintf (buf, "%.2f %s", (double) r / 1024.0, fmts[i + 1]);
+ snprintf (buf, szbuf, "%.2f %s", (double) r / 1024.0, fmts[i + 1]);
return buf;
}
if (new_r < 100)
{
- sprintf (buf, "%.1f %s", (double) r / 1024.0, fmts[i + 1]);
+ snprintf (buf, szbuf, "%.1f %s", (double) r / 1024.0, fmts[i + 1]);
return buf;
}
@@ -630,22 +630,22 @@ main_format_bcnt (xoff_t r, char *buf)
}
static char*
-main_format_rate (xoff_t bytes, long millis, char *buf)
+main_format_rate (xoff_t bytes, long millis, char *buf, int szbuf)
{
xoff_t r = (xoff_t)(1.0 * bytes / (1.0 * millis / 1000.0));
static char lbuf[48];
- main_format_bcnt (r, lbuf);
- sprintf (buf, "%s/s", lbuf);
+ main_format_bcnt (r, lbuf, sizeof(lbuf));
+ snprintf (buf, szbuf, "%s/s", lbuf);
return buf;
}
static char*
-main_format_millis (long millis, char *buf)
+main_format_millis (long millis, char *buf, int szbuf)
{
- if (millis < 1000) { sprintf (buf, "%lu ms", millis); }
- else if (millis < 10000) { sprintf (buf, "%.1f sec", millis / 1000.0); }
- else { sprintf (buf, "%lu sec", millis / 1000L); }
+ if (millis < 1000) { snprintf (buf, szbuf, "%lu ms", millis); }
+ else if (millis < 10000) { snprintf (buf, szbuf, "%.1f sec", millis / 1000.0); }
+ else { snprintf (buf, szbuf, "%lu sec", millis / 1000L); }
return buf;
}
@@ -2739,11 +2739,11 @@ main_set_appheader (xd3_stream *stream,
if (sfile->filename == NULL)
{
- sprintf ((char*)appheader_used, "%s/%s", iname, icomp);
+ snprintf ((char*)appheader_used, len, "%s/%s", iname, icomp);
}
else
{
- sprintf ((char*)appheader_used, "%s/%s/%s/%s",
+ snprintf ((char*)appheader_used, len, "%s/%s/%s/%s",
iname, icomp, sname, scomp);
}
}
@@ -2967,7 +2967,7 @@ main_get_winsize (main_file *ifile) {
{
XPR(NT "input %s window size %s\n",
ifile->filename,
- main_format_bcnt (size, iszbuf));
+ main_format_bcnt (size, iszbuf, sizeof(iszbuf)));
}
return size;
@@ -3345,25 +3345,25 @@ main_input (xd3_cmd cmd,
XPR(NT "%"Q"u: in %s (%s): out %s (%s): "
"total in %s: out %s: %s: srcpos %s\n",
stream.current_window,
- main_format_bcnt (this_read, rdb),
- main_format_rate (this_read, millis, rrateavg),
- main_format_bcnt (this_write, wdb),
- main_format_rate (this_write, millis, wrateavg),
- main_format_bcnt (stream.total_in, trdb),
- main_format_bcnt (stream.total_out, twdb),
- main_format_millis (millis, tm),
- main_format_bcnt (sfile->source_position, srcpos));
+ main_format_bcnt (this_read, rdb, sizeof(rdb)),
+ main_format_rate (this_read, millis, rrateavg, sizeof(rrateavg)),
+ main_format_bcnt (this_write, wdb, sizeof(wdb)),
+ main_format_rate (this_write, millis, wrateavg, sizeof(wrateavg)),
+ main_format_bcnt (stream.total_in, trdb, sizeof(trdb)),
+ main_format_bcnt (stream.total_out, twdb, sizeof(twdb)),
+ main_format_millis (millis, tm, sizeof(tm)),
+ main_format_bcnt (sfile->source_position, srcpos, sizeof(srcpos)));
}
else
{
XPR(NT "%"Q"u: in %s: out %s: total in %s: "
"out %s: %s\n",
stream.current_window,
- main_format_bcnt (this_read, rdb),
- main_format_bcnt (this_write, wdb),
- main_format_bcnt (stream.total_in, trdb),
- main_format_bcnt (stream.total_out, twdb),
- main_format_millis (millis, tm));
+ main_format_bcnt (this_read, rdb, sizeof(rdb)),
+ main_format_bcnt (this_write, wdb, sizeof(wdb)),
+ main_format_bcnt (stream.total_in, trdb, sizeof(trdb)),
+ main_format_bcnt (stream.total_out, twdb, sizeof(twdb)),
+ main_format_millis (millis, tm, sizeof(tm)));
}
}
}
@@ -3465,7 +3465,7 @@ done:
xoff_t nwrite = ofile != NULL ? ofile->nwrite : 0;
XPR(NT "finished in %s; input %"Q"u output %"Q"u bytes (%0.2f%%)\n",
- main_format_millis (end_time - start_time, tm),
+ main_format_millis (end_time - start_time, tm, sizeof(tm)),
ifile->nread, nwrite, 100.0 * nwrite / ifile->nread);
}

@ -0,0 +1,62 @@
From: Paul Jackson <pj@usa.net>, Paul Jackson <thepythoniccow@gmail.com>
xdelta3 automatically sets up child compression and decompression
processes and pipes data to and from them, in various cases.
Sometimes this can hang, due to improper closing, or lose
data, due to improper flushing.
This patch purports to fix this, but has not been tested
very well at all. More work may be needed here.
The patch also makes one error message less scary.
---
xdelta3-main.h | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
--- xdelta3.0.0.orig/xdelta3-main.h 2012-03-26 23:11:26.346316918 -0500
+++ xdelta3.0.0/xdelta3-main.h 2012-03-26 23:11:40.218752082 -0500
@@ -2135,9 +2135,11 @@ main_waitpid_check(pid_t pid)
}
else if (! WIFEXITED (status))
{
- ret = ECHILD;
- XPR(NT "external compression [pid %d] signal %d\n",
- pid, WIFSIGNALED (status) ? WTERMSIG (status) : WSTOPSIG (status));
+ if ( ! (WIFSIGNALED (status) && WTERMSIG (status) == SIGPIPE) ) {
+ ret = ECHILD;
+ XPR(NT "external compression [pid %d] signal %d\n",
+ pid, WIFSIGNALED (status) ? WTERMSIG (status) : WSTOPSIG (status));
+ }
}
else if (WEXITSTATUS (status) != 0)
{
@@ -2221,7 +2223,8 @@ main_pipe_copier (uint8_t *pipe_buf,
int force_drain = 0;
if (nread > 0 && (ret = main_pipe_write (outfd, pipe_buf, nread)))
{
- if (option_force && ret == EPIPE)
+ /* Next line: Until better fix, *always* drain if EPIPE. */
+ if ( /* option_force && */ ret == EPIPE)
{
/* This causes the loop to continue reading until nread
* == 0. */
@@ -2265,7 +2268,7 @@ main_pipe_copier (uint8_t *pipe_buf,
if (garbage != 0)
{
- XPR(NT "trailing garbage ignored in %s (%"Q"u bytes)\n",
+ XPR(NT "skipped trailing bytes in %s (%"Q"u bytes)\n",
ifile->filename, garbage);
}
return 0;
@@ -2354,6 +2357,8 @@ main_input_decompress_setup (const main_
}
if (close (inpipefd[PIPE_READ_FD]) ||
+ close (outpipefd[PIPE_READ_FD]) ||
+ close (outpipefd[PIPE_WRITE_FD]) ||
main_pipe_copier (pipe_buf, pipe_bufsize, pipe_avail,
ifile, inpipefd[PIPE_WRITE_FD]) ||
close (inpipefd[PIPE_WRITE_FD]))

@ -0,0 +1,65 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-util/xdelta/xdelta-3.0.0-r1.ebuild,v 1.1 2012/04/02 20:04:21 pacho Exp $
EAPI=4
PYTHON_DEPEND="2:2.6"
inherit distutils toolchain-funcs eutils
DESCRIPTION="a binary diff and differential compression tools. VCDIFF (RFC 3284) delta compression."
HOMEPAGE="http://xdelta.org"
SRC_URI="http://${PN}.googlecode.com/files/${P/-}.tar.gz"
LICENSE="GPL-2"
SLOT="3"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="test"
DEPEND="test? ( app-arch/ncompress )"
RDEPEND=""
S="${WORKDIR}/${P/-}"
DOCS="draft-korn-vcdiff.txt"
pkg_setup() {
python_set_active_version 2
python_pkg_setup
}
src_prepare() {
sed -i -e 's:-O3:-Wall:' setup.py || die "setup.py sed failed"
sed \
-e 's:-O3::g' \
-e 's:$(CC):$(CC) $(LDFLAGS):g' \
-e 's:CFLAGS=:CFLAGS+=:' \
-i Makefile || die "Makefile sed failed"
EPATCH_SOURCE="${FILESDIR}" epatch \
01_bigger_print_buffers.patch \
02_replace_sprintf_with_snprintf.patch \
03_fix_pipe_draining_and_closing.patch
}
src_test() {
if [ $UID != 0 ]; then
emake test
else
ewarn "Tests can't be run as root, skipping."
fi
}
src_compile() {
tc-export CC CXX
distutils_src_compile
emake xdelta3
if use test; then
emake xdelta3-debug
fi
}
src_install() {
dobin xdelta3
distutils_src_install
}

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/darcs.eclass,v 1.13 2011/12/27 17:55:12 fauli Exp $
# $Header: /var/cvsroot/gentoo-x86/eclass/darcs.eclass,v 1.14 2012/04/02 17:48:06 slyfox Exp $
# @ECLASS: darcs.eclass
# @MAINTAINER:
@ -69,9 +69,9 @@ SRC_URI=""
# @ECLASS-VARIABLE: EDARCS_OFFLINE
# @DESCRIPTION:
# Set this variable to a non-empty value to disable the automatic updating of
# a darcs repository. this is intended to be set outside the darcs source
# tree by users.
: ${EDARCS_OFFLINE:=${ESCM_OFFLINE}}
# a darcs repository. This is intended to be set outside the darcs source
# tree by users. Defaults to EVCS_OFFLINE value.
: ${EDARCS_OFFLINE:=${EVCS_OFFLINE}}
# @ECLASS-VARIABLE: EDARCS_CLEAN
# @DESCRIPTION:
@ -82,8 +82,8 @@ SRC_URI=""
# --- end ebuild-configurable settings ---
# add darcs to deps
DEPEND="dev-vcs/darcs"
DEPEND="dev-vcs/darcs
net-misc/rsync"
# @FUNCTION: darcs_patchcount
# @DESCRIPTION:
@ -196,7 +196,7 @@ darcs_src_unpack() {
mkdir -p "${WORKDIR}/${P}"
eshopts_push -s dotglob # get any dotfiles too.
rsync -rlpgo --exclude="_darcs/" "${EDARCS_TOP_DIR}/${EDARCS_LOCALREPO}"/* "${WORKDIR}/${P}"
rsync -rlpgo "${EDARCS_TOP_DIR}/${EDARCS_LOCALREPO}"/* "${WORKDIR}/${P}"
eshopts_pop
einfo "Darcs repository contents are now in ${WORKDIR}/${P}"

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.387 2012/03/23 02:33:49 vapier Exp $
# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.388 2012/04/02 22:13:57 pacho Exp $
# @ECLASS: eutils.eclass
# @MAINTAINER:
@ -1002,7 +1002,7 @@ strip-linguas() {
fi
done
[[ -n ${nols} ]] \
&& ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
&& einfo "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
export LINGUAS=${newls:1}
}

@ -1,9 +1,9 @@
# Copyright 1999-2010 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/games-puzzle/connectagram/connectagram-1.0.1-r1.ebuild,v 1.2 2010/02/27 18:12:30 phajdan.jr Exp $
# $Header: /var/cvsroot/gentoo-x86/games-puzzle/connectagram/connectagram-1.0.1-r1.ebuild,v 1.3 2012/04/02 21:34:58 mr_bones_ Exp $
EAPI=2
inherit gnome2-utils qt4 games
inherit gnome2-utils qt4-r2 games
DESCRIPTION="A word unscrambling game"
HOMEPAGE="http://gottcode.org/connectagram/"
@ -14,7 +14,8 @@ SLOT="0"
KEYWORDS="~amd64 x86"
IUSE=""
DEPEND="x11-libs/qt-gui:4"
DEPEND="x11-libs/qt-core:4
x11-libs/qt-gui:4"
src_prepare() {
sed -i \
@ -25,7 +26,7 @@ src_prepare() {
}
src_configure() {
eqmake4
qt4-r2_src_configure
}
src_install() {

@ -1,2 +1,3 @@
DIST freeciv-2.3.0.tar.bz2 30239019 RMD160 1f017139c5ac4c24d1b4b6767aca84e18b9db31b SHA1 d4e871ad749e1807957df4e353fbb8f5510b7248 SHA256 f380f7f89a3478e8b2a68033b37325539248618508d94edf55b84e5e979fbefa
DIST freeciv-2.3.1.tar.bz2 30528325 RMD160 84bb3f0381284b003a34c5a659f013c4fc75a3c4 SHA1 9d9ee9f48f4c945fc6525139d340443d5a25aac4 SHA256 236686fc7f9cf387aba26b6919a87a791fb23e8aabb19181823349983c986ad8
DIST freeciv-2.3.2.tar.bz2 30695128 RMD160 63bea690cfd6953bfb30d320a3e3f7a69353b64c SHA1 e6267b5e0483cf9c29d01793d2f9433e73d62191 SHA256 95b1c8cb1bc859abc883221e3e89f67a53799071fdb1fea7b8727fbab0cb4c4e

@ -1,5 +1,5 @@
--- doc/man/Makefile.in.orig 2011-08-19 14:54:02.163463916 -0400
+++ doc/man/Makefile.in 2011-08-19 14:54:31.354583970 -0400
--- doc/man/Makefile.in.orig
+++ doc/man/Makefile.in
@@ -360,8 +360,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@

@ -1,5 +1,5 @@
--- doc/man/Makefile.in.orig 2011-11-30 10:50:39.673495365 -0500
+++ doc/man/Makefile.in 2011-11-30 10:51:05.107409054 -0500
--- doc/man/Makefile.in.orig
+++ doc/man/Makefile.in
@@ -358,7 +358,6 @@
top_srcdir = @top_srcdir@
MAN_PAGES = \

@ -0,0 +1,19 @@
--- doc/man/Makefile.in.orig
+++ doc/man/Makefile.in
@@ -358,7 +358,6 @@
top_srcdir = @top_srcdir@
MAN_PAGES = \
freeciv-server.6 \
- freeciv-client.6 \
freeciv-modpack.6
MAN_LINKS = \
@@ -368,7 +367,7 @@
freeciv-win32.6 \
freeciv-ftwl.6
-man_MANS = $(MAN_PAGES) $(MAN_LINKS)
+man_MANS = $(MAN_PAGES)
EXTRA_DIST = $(MAN_LINKS)
all: all-am

@ -0,0 +1,125 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.3.2.ebuild,v 1.1 2012/04/02 18:10:36 mr_bones_ Exp $
EAPI=2
inherit eutils gnome2-utils games-ggz games
DESCRIPTION="multiplayer strategy game (Civilization Clone)"
HOMEPAGE="http://www.freeciv.org/"
SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="auth dedicated ggz gtk ipv6 nls readline sdl +sound"
RDEPEND="readline? ( sys-libs/readline )
sys-libs/zlib
app-arch/bzip2
auth? ( virtual/mysql )
!dedicated? (
nls? ( virtual/libintl )
gtk? ( x11-libs/gtk+:2 )
sdl? (
media-libs/libsdl[video]
media-libs/sdl-image[png]
media-libs/freetype
)
!gtk? ( !sdl? ( x11-libs/gtk+:2 ) )
sound? (
media-libs/libsdl[audio]
media-libs/sdl-mixer
)
ggz? ( games-board/ggz-gtk-client )
media-libs/libpng
)"
DEPEND="${RDEPEND}
dev-util/pkgconfig
!dedicated? (
nls? ( sys-devel/gettext )
x11-proto/xextproto
)"
src_prepare() {
# install the .desktop in /usr/share/applications
# install the icons in /usr/share/pixmaps
sed -i \
-e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
-e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
-e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
client/Makefile.in \
server/Makefile.in \
modinst/Makefile.in \
data/Makefile.in \
data/icons/Makefile.in \
|| die "sed failed"
# remove civclient manpage if dedicated server
if use dedicated ; then
epatch "${FILESDIR}"/${P}-clean-man.patch
fi
}
src_configure() {
local myclient myopts
if use dedicated ; then
myclient="no"
else
use sdl && myclient="${myclient} sdl"
use gtk && myclient="${myclient} gtk"
[[ -z ${myclient} ]] && myclient="gtk" # default to gtk if none specified
myopts=$(use_with ggz ggz-client)
fi
egamesconf \
--disable-dependency-tracking \
--localedir=/usr/share/locale \
--with-ggzconfig=/usr/bin \
--enable-noregistry="${GGZ_MODDIR}" \
$(use_enable auth) \
$(use_enable ipv6) \
$(use_enable nls) \
$(use_with readline) \
$(use_enable sound sdl-mixer) \
${myopts} \
--enable-client="${myclient}"
}
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
if ! use dedicated ; then
# Create and install the html manual. It can't be done for dedicated
# servers, because the 'civmanual' tool is then not built. Also
# delete civmanual from the GAMES_BINDIR, because it's then useless.
# Note: to have it localized, it should be ran from _postinst, or
# something like that, but then it's a PITA to avoid orphan files...
./manual/freeciv-manual || die "freeciv-manual failed"
dohtml manual*.html || die "dohtml failed"
rm -f "${D}/${GAMES_BINDIR}"/civmanual
use sdl && make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client
fi
dodoc ChangeLog NEWS doc/{BUGS,CodingStyle,HACKING,HOWTOPLAY,README*,TODO}
rm -rf "${D}$(games_get_libdir)"
prepgamesdirs
}
pkg_preinst() {
games_pkg_preinst
gnome2_icon_savelist
}
pkg_postinst() {
games_pkg_postinst
games-ggz_update_modules
gnome2_icon_cache_update
}
pkg_postrm() {
games-ggz_update_modules
gnome2_icon_cache_update
}

@ -0,0 +1,120 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.2-r1.ebuild,v 1.1 2012/04/02 20:46:24 voyageur Exp $
EAPI=4
inherit gnustep-base eutils prefix toolchain-funcs
DESCRIPTION="GNUstep Makefile Package"
HOMEPAGE="http://www.gnustep.org"
SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE="libobjc2 native-exceptions"
DEPEND="${GNUSTEP_CORE_DEPEND}
>=sys-devel/make-3.75
libobjc2? ( gnustep-base/libobjc2
>=sys-devel/clang-2.9 )
!libobjc2? ( >=sys-devel/gcc-3.3[objc] )"
RDEPEND="${DEPEND}"
pkg_setup() {
# Determine libobjc.so to use
if use libobjc2; then
libobjc_version=libobjc.so.4
else
# Test new libobjc.so.3
$(tc-getCC) -Werror -Wl,-l:libobjc.so.3 "${FILESDIR}"/testlibobjc.m -o /dev/null 2> /dev/null \
&& libobjc_version=libobjc.so.3 \
|| libobjc_version=libobjc.so.2
fi
# For existing installations, determine if we will use another libobjc.so
if has_version gnustep-base/gnustep-make; then
local current_libobjc="$(awk -F: '/^OBJC_LIB_FLAG/ {print $2}' ${EPREFIX}/usr/share/GNUstep/Makefiles/config.make)"
# Old installations did not set this explicitely
: ${current_libobjc:=libobjc.so.2}
if [[ ${current_libobjc} != ${libobjc_version} ]]; then
ewarn "Warning: changed libobjc.so version!!"
ewarn "The libobjc.so version used for gnustep-make has changed"
ewarn "(either by the libojbc2 use-flag or a GCC upgrade)"
ewarn "You must rebuild all gnustep packages installed."
ewarn ""
ewarn "To do so, please emerge gnustep-base/gnustep-updater and run:"
ewarn "# gnustep-updater -l"
fi
fi
if use libobjc2; then
export CC=clang
fi
}
src_prepare() {
# Multilib-strict
sed -e "s#/lib#/$(get_libdir)#" -i FilesystemLayouts/fhs-system || die "sed failed"
epatch "${FILESDIR}"/${PN}-2.0.1-destdir.patch
cp "${FILESDIR}"/gnustep-4.{csh,sh} "${T}"/
eprefixify "${T}"/gnustep-4.{csh,sh}
}
src_configure() {
#--enable-objc-nonfragile-abi: only working in clang for now
econf \
--with-layout=fhs-system \
--with-config-file="${EPREFIX}"/etc/GNUstep/GNUstep.conf \
--with-objc-lib-flag=-l:${libobjc_version} \
$(use_enable libobjc2 objc-nonfragile-abi) \
$(use_enable native-exceptions native-objc-exceptions)
}
src_compile() {
emake
# Prepare doc here (needed when no gnustep-make is already installed)
if use doc ; then
# If a gnustep-1 environment is set
unset GNUSTEP_MAKEFILES
pushd Documentation &> /dev/null
emake all install
popd &> /dev/null
fi
}
src_install() {
# Get GNUSTEP_* variables
. ./GNUstep.conf
local make_eval
use debug || make_eval="${make_eval} debug=no"
make_eval="${make_eval} verbose=yes"
emake ${make_eval} DESTDIR="${D}" install
# Copy the documentation
if use doc ; then
dodir ${GNUSTEP_SYSTEM_DOC}
cp -r Documentation/tmp-installation/System/Library/Documentation/* \
"${ED}"${GNUSTEP_SYSTEM_DOC=}
fi
dodoc FAQ README RELEASENOTES
exeinto /etc/profile.d
doexe "${T}"/gnustep-4.sh
doexe "${T}"/gnustep-4.csh
}
pkg_postinst() {
# Warn about new layout if old GNUstep directory is still here
if [ -e /usr/GNUstep/System ]; then
ewarn "Old layout directory detected (/usr/GNUstep/System)"
ewarn "Gentoo has switched to FHS layout for GNUstep packages"
ewarn "You must first update the configuration files from this package,"
ewarn "then remerge all packages still installed with the old layout"
ewarn "You can use gnustep-base/gnustep-updater for this task"
fi
}

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild,v 1.4 2012/02/20 20:05:38 voyageur Exp $
# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild,v 1.5 2012/04/02 20:46:24 voyageur Exp $
EAPI=4
inherit gnustep-base eutils prefix toolchain-funcs
@ -12,13 +12,11 @@ SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE="libobjc2 native-exceptions"
IUSE="native-exceptions"
DEPEND="${GNUSTEP_CORE_DEPEND}
>=sys-devel/make-3.75
libobjc2? ( gnustep-base/libobjc2
>=sys-devel/clang-2.9 )
!libobjc2? ( >=sys-devel/gcc-3.3[objc] )"
>=sys-devel/gcc-3.3[objc]"
RDEPEND="${DEPEND}"
pkg_setup() {

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.8.1-r2.ebuild,v 1.3 2012/03/27 18:33:39 ssuominen Exp $
# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.8.1-r2.ebuild,v 1.4 2012/04/02 09:37:56 johu Exp $
EAPI=4
@ -17,7 +17,7 @@ EGIT_BRANCH="KDE/4.8"
DESCRIPTION="KDE libraries needed by all KDE programs."
HOMEPAGE="http://www.kde.org/"
KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
LICENSE="LGPL-2.1"
IUSE="3dnow acl alsa altivec +bzip2 debug doc fam +handbook jpeg2k kerberos lzma
mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.8.1.ebuild,v 1.3 2012/03/31 14:06:53 maekke Exp $
# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.8.1.ebuild,v 1.4 2012/04/02 15:55:35 johu Exp $
EAPI=4
@ -14,7 +14,7 @@ HOMEPAGE="http://www.kde.org/"
KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
LICENSE="LGPL-2.1"
IUSE="debug ldap +prison semantic-desktop"
IUSE="debug ldap prison semantic-desktop"
# some akonadi tests timeout, that probaly needs more work as its ~700 tests
RESTRICT="test"

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.8.1.ebuild,v 1.2 2012/03/25 09:14:42 dilfridge Exp $
# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.8.1.ebuild,v 1.3 2012/04/02 11:25:42 johu Exp $
EAPI=4
@ -41,6 +41,9 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
"
# bug 410253
RESTRICT="test"
src_prepare() {
use semantic-desktop || epatch "${FILESDIR}/${PN}-4.6.2-optional-akonadi.patch"
kde4-base_src_prepare

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/klipper-4.8.1.ebuild,v 1.2 2012/03/31 16:59:36 maekke Exp $
# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/klipper-4.8.1.ebuild,v 1.3 2012/04/02 10:41:28 johu Exp $
EAPI=4
@ -10,11 +10,20 @@ inherit kde4-meta
DESCRIPTION="Applet for KDE and X clipboard management"
KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
IUSE="debug"
IUSE="debug prison"
DEPEND="
$(add_kdebase_dep libkworkspace)
$(add_kdebase_dep libtaskmanager)
prison? ( media-libs/prison )
!aqua? ( x11-libs/libXfixes )
"
RDEPEND="${DEPEND}"
src_configure() {
mycmakeargs=(
$(cmake-utils_use_with prison Prison)
)
kde4-meta_src_configure
}

@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>kde</herd>
<herd>kde</herd>
<use>
<flag name="prison">Enable support for barcodes/QRcodes</flag>
</use>
</pkgmetadata>

@ -1,3 +1 @@
DIST akonadi-google-0.2_p20111229.tar.xz 95520 RMD160 3b5cccf2d810477031f636fcb43355190e49af54 SHA1 81678586333e5f9e6c7f4a9d666b3d6e28a67a4b SHA256 7c9ea3b9dd4f50af51f1bac33c125280d45a217e2ba02f96e8d4f626d5a1f281
DIST akonadi-google-0.2_p20120130.tar.xz 105852 RMD160 b5ebb24a1a6afb05d7e2cc2831e4fff86dea5d96 SHA1 86de1775b39522ec84267594f8868f42af9febb6 SHA256 cf15397aa97c574fe6a1ac2a89f4ad04554fb51e6fc94b26e14ea085146259a0
DIST akonadi-google-0.2_p20120222.tar.xz 106588 RMD160 195ee88b5c04f8134259f0510f9e174c27573557 SHA1 1a0f835f84cfa769c99bedc6a936fcc5a833c030 SHA256 9e2f7c646c6a7391ed8349712461b55b8abae6d0b574a318226953de07945ba0
DIST akonadi-google-0.3.tar.gz 139920 RMD160 44670a4581adad3c35c6c0a7f6bfd8ff9f24da46 SHA1 959da6470c0cd3da3d6acf3bbd37f5bedee5c39d SHA256 85275628d09308f6b5e8f0c198749678cea472d0bb841d69be4ac19599970174

@ -1,35 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/kde-misc/akonadi-google/akonadi-google-0.2_p20111229.ebuild,v 1.2 2012/02/26 23:31:15 dilfridge Exp $
EAPI=4
KDE_SCM="git"
EGIT_REPONAME="akonadi-google"
inherit kde4-base
DESCRIPTION="Google services integration in Akonadi"
HOMEPAGE="https://projects.kde.org/projects/playground/pim/akonadi-google"
LICENSE="GPL-2"
SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz"
SLOT="4"
KEYWORDS="~amd64 ~x86"
IUSE="oldpim"
DEPEND="
$(add_kdebase_dep kdepimlibs semantic-desktop)
dev-libs/libxslt
dev-libs/qjson
oldpim? ( dev-libs/boost )
!oldpim? ( $(add_kdebase_dep kdepimlibs semantic-desktop 4.6.0) )
"
RDEPEND=${DEPEND}
src_configure() {
mycmakeargs=(
$(cmake-utils_use oldpim KCAL)
)
kde4-base_src_configure
}

@ -1,35 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/kde-misc/akonadi-google/akonadi-google-0.2_p20120222.ebuild,v 1.3 2012/02/26 23:31:15 dilfridge Exp $
EAPI=4
KDE_SCM="git"
EGIT_REPONAME="akonadi-google"
inherit kde4-base
DESCRIPTION="Google services integration in Akonadi"
HOMEPAGE="https://projects.kde.org/projects/playground/pim/akonadi-google"
LICENSE="GPL-2"
SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz"
SLOT="4"
KEYWORDS="~amd64 ~x86"
IUSE="oldpim"
DEPEND="
$(add_kdebase_dep kdepimlibs semantic-desktop)
dev-libs/libxslt
dev-libs/qjson
oldpim? ( dev-libs/boost )
!oldpim? ( $(add_kdebase_dep kdepimlibs semantic-desktop 4.6.0) )
"
RDEPEND=${DEPEND}
src_configure() {
mycmakeargs=(
$(cmake-utils_use oldpim KCAL)
)
kde4-base_src_configure
}

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/kde-misc/akonadi-google/akonadi-google-0.2_p20120130.ebuild,v 1.2 2012/02/26 23:31:15 dilfridge Exp $
# $Header: /var/cvsroot/gentoo-x86/kde-misc/akonadi-google/akonadi-google-0.3.ebuild,v 1.1 2012/04/02 08:21:20 scarabeus Exp $
EAPI=4
@ -10,10 +10,9 @@ inherit kde4-base
DESCRIPTION="Google services integration in Akonadi"
HOMEPAGE="https://projects.kde.org/projects/playground/pim/akonadi-google"
LICENSE="GPL-2"
SRC_URI="http://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
SRC_URI="http://www.progdan.cz/wp-content/uploads/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="4"
KEYWORDS="~amd64 ~x86"
IUSE="oldpim"

@ -0,0 +1 @@
DIST Symbola701.zip 2404193 RMD160 b55e5431cfe0837553984df004255488e370a71e SHA1 b95d0004f43689131ae23c5fb22c4f0bd120a9a7 SHA256 41e9437fb80f54bd6d6f0b9280f46a167d37d262911764de0cec8d2b849e10b2

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>fonts</herd>
<maintainer>
<email>chithanh@gentoo.org</email>
<name>Chí-Thanh Christopher Nguyễn</name>
</maintainer>
</pkgmetadata>

@ -0,0 +1,30 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-fonts/symbola/symbola-7.01.ebuild,v 1.1 2012/04/02 12:42:26 chithanh Exp $
EAPI=4
MY_PN="${PN/s/S}"
inherit font
DESCRIPTION="Unicode font for Basic Latin, IPA Extensions, Greek, Cyrillic and many Symbol Blocks"
HOMEPAGE="http://users.teilar.gr/~g1951d/"
SRC_URI="http://users.teilar.gr/~g1951d/${MY_PN}${PV/./}.zip"
LICENSE="as-is"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc"
DEPEND="app-arch/unzip"
RDEPEND=""
S="${WORKDIR}"
FONT_SUFFIX="ttf"
pkg_setup() {
if use doc; then
DOCS=( ${MY_PN}.pdf )
fi
}

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild,v 1.17 2011/10/30 12:59:41 sping Exp $
# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild,v 1.19 2012/04/02 13:34:47 ssuominen Exp $
EAPI=2

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild,v 1.17 2011/10/30 12:59:41 sping Exp $
# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild,v 1.19 2012/04/02 13:34:47 ssuominen Exp $
EAPI=2
@ -17,7 +17,7 @@ LICENSE="|| ( GPL-2 BL BSD )"
KEYWORDS="amd64 ppc ppc64 x86"
RDEPEND="ffmpeg? ( virtual/ffmpeg[encode,theora] )
media-libs/openjpeg
>=media-libs/openjpeg-1.5.0
media-libs/tiff
>=dev-lang/python-2.5
nls? ( >=media-libs/freetype-2.0
@ -58,6 +58,11 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-2.49a-sys-openjpeg.patch
epatch "${FILESDIR}"/${PN}-2.49a-bake.patch
rm -f "${S}/release/scripts/bpymodules/"*.pyc
# Fix building with >=media-libs/openjpeg-1.5.0 (bug #409283)
sed -i \
-e '/parameters.*tile_size_on/s:false:FALSE:' \
source/blender/imbuf/intern/jp2.c || die
}
src_configure() {

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild,v 1.12 2011/11/13 07:19:54 lu_zero Exp $
# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild,v 1.14 2012/04/02 13:34:47 ssuominen Exp $
EAPI=2
@ -17,7 +17,7 @@ LICENSE="|| ( GPL-2 BL BSD )"
KEYWORDS="amd64 ppc ppc64 x86"
RDEPEND="ffmpeg? ( virtual/ffmpeg[encode,theora] )
media-libs/openjpeg
>=media-libs/openjpeg-1.5.0
media-libs/tiff
>=dev-lang/python-2.5
nls? ( >=media-libs/freetype-2.0
@ -61,6 +61,11 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-2.49b-subversion-1.7.patch
epatch "${FILESDIR}"/${P}-libav-0.7.patch
rm -f "${S}/release/scripts/bpymodules/"*.pyc
# Fix building with >=media-libs/openjpeg-1.5.0 (bug #409283)
sed -i \
-e '/parameters.*tile_size_on/s:false:FALSE:' \
source/blender/imbuf/intern/jp2.c || die
}
src_configure() {

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild,v 1.11 2012/02/23 16:57:16 xarthisius Exp $
# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild,v 1.13 2012/04/02 13:34:47 ssuominen Exp $
PYTHON_DEPEND="3:3.2"
@ -58,7 +58,10 @@ RDEPEND="virtual/jpeg
openexr? ( media-libs/openexr )
ffmpeg? (
virtual/ffmpeg[x264,mp3,encode,theora]
jpeg2k? ( virtual/ffmpeg[x264,mp3,encode,theora,jpeg2k] )
jpeg2k? (
!<media-libs/openjpeg-1.5.0
virtual/ffmpeg[x264,mp3,encode,theora,jpeg2k]
)
)
openal? ( >=media-libs/openal-1.6.372 )
fftw? ( sci-libs/fftw:3.0 )
@ -156,6 +159,11 @@ src_prepare() {
# Linux 3.x (bug #381099)
epatch "${FILESDIR}"/${P}-linux-3.patch
# Fix building with >=media-libs/openjpeg-1.5.0 (bug #409283)
sed -i \
-e '/parameters.*tile_size_on/s:false:FALSE:' \
source/blender/imbuf/intern/jp2.c || die
}
src_configure() {

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.9 2012/02/23 16:57:16 xarthisius Exp $
# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.11 2012/04/02 13:34:47 ssuominen Exp $
PYTHON_DEPEND="3:3.2"
EAPI=4
@ -54,7 +54,10 @@ RDEPEND="virtual/jpeg
openexr? ( media-libs/openexr )
ffmpeg? (
>=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora]
jpeg2k? ( >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k] )
jpeg2k? (
!<media-libs/openjpeg-1.5.0
>=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k]
)
)
openal? ( >=media-libs/openal-1.6.372 )
fftw? ( sci-libs/fftw:3.0 )
@ -148,6 +151,11 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-libav-0.7.patch
epatch "${FILESDIR}"/${P}-CVE-2009-3850-v3.patch
epatch "${FILESDIR}"/${P}-enable_site_module.patch
# Fix building with >=media-libs/openjpeg-1.5.0 (bug #409283)
sed -i \
-e '/parameters.*tile_size_on/s:false:FALSE:' \
source/blender/imbuf/intern/jp2.c || die
}
src_configure() {

@ -1,3 +1,3 @@
DIST fotoxx-11.08.1.tar.gz 1477220 RMD160 640ea896325383b495702577c274dfbd75e4dc5f SHA1 cad763c6e6b295166ad8c54c0f74ea0ad47e2254 SHA256 5d161f5311b7dadfb32c03bff6b97cafab1019ac462ea6bb8031c2ea1d341f70
DIST fotoxx-12.02.tar.gz 1710672 RMD160 1470813933010a86fd3891d341e7f47906c9676f SHA1 1f97a8ed131997074dc6b25593cded5e86f4bd83 SHA256 bed385b9b378994e845cd7ab032471ec27ad62873b22e73cb5b6f21c577dc954
DIST fotoxx-12.03.tar.gz 1713624 RMD160 0323beead89795cd3a8b06e4a8a7b5ff548b30fd SHA1 494e1e946dae47d2245ad366c7e2da0f92ac9f43 SHA256 e6f5ee627bb8d718864295ea7ce3f50bbdc6ad555eb6fba04743c98282503a44
DIST fotoxx-12.04.tar.gz 1694180 RMD160 88bd3f36caf46c574b9ef0c72813517189a319c2 SHA1 3dfb17b1b63c04807613b26effacd0e86a7d9d87 SHA256 a80c83e347a2e38cc8ff0d39137846c5a729a4a551f1b272ee30a280d41169f3

@ -1,11 +1,11 @@
diff -r -U1 fotoxx-12.02.orig/Makefile fotoxx-12.02/Makefile
--- fotoxx-12.02.orig/Makefile 2012-01-30 03:31:53.000000000 +0700
+++ fotoxx-12.02/Makefile 2012-02-04 21:39:45.000000000 +0700
diff -r -U1 fotoxx-12.03.orig/Makefile fotoxx-12.03/Makefile
--- fotoxx-12.03.orig/Makefile 2012-03-01 01:57:48.000000000 +0700
+++ fotoxx-12.03/Makefile 2012-03-03 03:56:44.000000000 +0700
@@ -5,4 +5,4 @@
# defaults for parameters that may be pre-defined
-CXXFLAGS ?= -O3 -g -Wall
-CXXFLAGS ?= -O3 -g -Wall -Wno-deprecated-declarations
-LDFLAGS ?= -O3 -g -Wall -rdynamic
+CXXFLAGS += -Wall
+CXXFLAGS += -Wall -Wno-deprecated-declarations
+LDFLAGS += -rdynamic
PREFIX ?= /usr
@@ -14,3 +14,3 @@
@ -24,10 +24,10 @@ diff -r -U1 fotoxx-12.02.orig/Makefile fotoxx-12.02/Makefile
- cp -f desktop $(DESTDIR)$(MENUFILE)
- xdg-desktop-menu install $(DESTDIR)$(MENUFILE)
diff -r -U1 fotoxx-12.02.orig/zfuncs.cc fotoxx-12.02/zfuncs.cc
--- fotoxx-12.02.orig/zfuncs.cc 2012-01-30 03:31:53.000000000 +0700
+++ fotoxx-12.02/zfuncs.cc 2012-02-04 21:41:25.000000000 +0700
@@ -3169,3 +3169,3 @@
diff -r -U1 fotoxx-12.03.orig/zfuncs.cc fotoxx-12.03/zfuncs.cc
--- fotoxx-12.03.orig/zfuncs.cc 2012-03-01 01:57:48.000000000 +0700
+++ fotoxx-12.03/zfuncs.cc 2012-03-03 03:58:13.000000000 +0700
@@ -3194,3 +3194,3 @@
strncatv(zlocalesdir,199,work,"/share/",zappname,"/locales",null); // /prefix/share/appname/locales
- strncatv(zdocdir,199,work,"/share/doc/",zappname,null); // /prefix/share/doc/appname
+ strncatv(zdocdir,199,work,"/share/doc/",PF,null); // /prefix/share/doc/${PF}

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-12.02.ebuild,v 1.1 2012/02/04 15:06:14 grozin Exp $
# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-12.04.ebuild,v 1.1 2012/04/02 09:16:01 grozin Exp $
EAPI=3
inherit eutils toolchain-funcs

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.12.ebuild,v 1.3 2012/04/02 03:47:47 jer Exp $
# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.12.ebuild,v 1.4 2012/04/02 16:41:21 ago Exp $
EAPI="3"
@ -16,7 +16,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="2"
KEYWORDS="~alpha ~amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="alsa aalib altivec curl dbus debug doc exif gnome jpeg lcms mmx mng pdf png python smp sse svg tiff webkit wmf"

@ -1 +1 @@
DIST libdlna-0.2.3.tar.bz2 37142 RMD160 b6ef7cca1c661b95d3f8892ad99179fae9ddfbf4 SHA1 87159167610abde806a7addb8e425dbdc446856e SHA256 8eb7941cbae088026dd394fbe6f465cae6dd848edc430c6313f04cf57d1192b4
DIST libdlna-0.2.4.tar.bz2 37579 RMD160 6083bdcb7b5bc048f5b81373ef452145ba913861 SHA1 5e86f4443eeb9e7194c808301efeb78611a9e8b3 SHA256 4b2787392ea5ff61c0056bbaa0bb00a2c83d595d20b5658741658cddd17678c5

@ -1,8 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/libdlna/libdlna-0.2.3.ebuild,v 1.3 2011/11/11 12:36:39 aballier Exp $
# $Header: /var/cvsroot/gentoo-x86/media-libs/libdlna/libdlna-0.2.4.ebuild,v 1.1 2012/04/02 19:03:59 pacho Exp $
EAPI=2
EAPI=4
inherit eutils multilib
DESCRIPTION="A reference open-source implementation of DLNA (Digital Living Network Alliance) standards."
@ -17,26 +17,22 @@ IUSE=""
DEPEND=">=virtual/ffmpeg-0.6.90"
RDEPEND="${DEPEND}"
src_prepare() {
epatch "${FILESDIR}/${P}-libavcodec-libavformat-include-paths.patch" \
"${FILESDIR}/${P}-ffmpeg_api.patch"
}
src_configure() {
# I can't use econf
# --host is not implemented in ./configure file
./configure \
--prefix=/usr \
--libdir=/usr/$(get_libdir) \
--disable-static \
|| die "./configure failed"
}
src_compile() {
# not parallel safe, error "cannot find -ldlna"
emake -j1 || die "emake failed"
emake -j1
}
src_install() {
emake DESTDIR="${D}" install || die "emake install failed."
dodoc README AUTHORS ChangeLog || die
}
#src_install() {
# emake DESTDIR="${D}" install || die "emake install failed."
# dodoc README AUTHORS ChangeLog || die
#}

@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
<email>maintainer-needed@gentoo.org</email>
</maintainer>
<herd>proxy-maintainers</herd>
<maintainer>
<email>blef@codejunkie.net</email>
<name>Sal Gonzalez</name>
<description>Maintainer. Assign bugs to him</description>
</maintainer>
</pkgmetadata>

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.49.ebuild,v 1.1 2012/03/30 17:33:57 ssuominen Exp $
# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.49.ebuild,v 1.2 2012/04/02 16:42:17 ago Exp $
# this ebuild is only for the libpng12.so.0 SONAME for ABI compat
@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="as-is"
SLOT="1.2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
IUSE=""
RDEPEND="sys-libs/zlib

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.10.ebuild,v 1.2 2012/03/31 16:10:02 jer Exp $
# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.10.ebuild,v 1.3 2012/04/02 16:42:17 ago Exp $
EAPI=4
@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
LICENSE="as-is"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="apng neon static-libs"
RDEPEND="sys-libs/zlib"

@ -1,101 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/libwmf-0.2.8.4-r3.ebuild,v 1.13 2011/05/23 17:18:32 scarabeus Exp $
EAPI=4
inherit eutils autotools
#The configure script finds the 5.50 ghostscript Fontmap file while run.
#This will probably work, especially since the real one (6.50) in this case
#is empty. However beware in case there is any trouble
DESCRIPTION="library for converting WMF files"
HOMEPAGE="http://wvware.sourceforge.net/"
SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
IUSE="X expat xml debug doc gtk"
RDEPEND="app-text/ghostscript-gpl
xml? ( dev-libs/libxml2 )
expat? ( dev-libs/expat )
>=media-libs/freetype-2.0.1
sys-libs/zlib
>=media-libs/libpng-1.4
virtual/jpeg
X? (
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
)
gtk? ( x11-libs/gtk+:2 ) "
DEPEND="${RDEPEND}
dev-util/pkgconfig
X? (
x11-libs/libXt
x11-libs/libXpm
)"
# plotutils are not really supported yet, so looks like that's it
REQUIRED_USE="xml? ( !expat ) expat? ( !xml )"
src_prepare() {
if ! use doc ; then
sed -e 's:doc::' -i Makefile.am || die
fi
epatch \
"${FILESDIR}"/${P}-intoverflow.patch \
"${FILESDIR}"/${P}-build.patch \
"${FILESDIR}"/${P}-pngfix.patch \
"${FILESDIR}"/${P}-libpng-1.5.patch
eautoreconf
}
src_configure() {
# NOTE: The gd that is included is gd-2.0.0. Even with --with-sys-gd, that gd is built
# and included in libwmf. Since nothing in-tree seems to use media-libs/libwmf[gd],
# we're explicitly disabling gd use w.r.t. bug 268161
econf \
--disable-static \
$(use_enable debug) \
$(use_with X x) \
$(use_with expat) \
$(use_with xml libxml2) \
--disable-gd \
--with-sys-gd \
--with-gsfontdir="${EPREFIX}"/usr/share/ghostscript/fonts \
--with-fontdir="${EPREFIX}"/usr/share/libwmf/fonts/ \
--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
}
src_install() {
# bug #298596
emake -j1 install DESTDIR="${D}"
dodoc README AUTHORS CREDITS ChangeLog NEWS TODO
find "${ED}" -name '*.la' -exec rm -f '{}' +
}
set_gtk_confdir() {
# An arch specific config directory is used on multilib systems
has_multilib_profile && GTK2_CONFDIR="${EROOT}etc/gtk-2.0/${CHOST}"
GTK2_CONFDIR="${GTK2_CONFDIR:-${EROOT}etc/gtk-2.0}"
}
pkg_postinst() {
if use gtk; then
set_gtk_confdir
gdk-pixbuf-query-loaders > "${GTK2_CONFDIR}/gdk-pixbuf.loaders"
fi
}
pkg_postrm() {
if use gtk; then
set_gtk_confdir
gdk-pixbuf-query-loaders > "${GTK2_CONFDIR}/gdk-pixbuf.loaders"
fi
}

@ -2,7 +2,6 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>gstreamer</herd>
<herd>gnome</herd>
<use>
<flag name="orc">Use <pkg>dev-lang/orc</pkg> for runtime
optimisations</flag>

@ -0,0 +1,48 @@
commit 94a0a210a485ce1fc95c47a6bc67c4c16c89a0f9
Author: Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>
Date: Sun Mar 25 16:42:12 2012 +0200
Updated LIVE to latest changes in vdr 1.7.27
- Do not use the direct access to cRecoding members any more.
diff --git a/epg_events.cpp b/epg_events.cpp
index a514769..cd4996e 100644
--- a/epg_events.cpp
+++ b/epg_events.cpp
@@ -182,12 +182,20 @@ namespace vdrlive
time_t EpgRecording::GetStartTime() const
{
+#if VDRVERSNUM < 10726
return m_recording ? m_recording->start : 0;
+#else
+ return m_recording ? m_recording->Start() : 0;
+#endif
}
time_t EpgRecording::GetEndTime() const
{
+#if VDRVERSNUM < 10726
return m_recording ? m_recording->start : 0;
+#else
+ return m_recording ? m_recording->Start() : 0;
+#endif
}
const string EpgRecording::Name() const
diff --git a/recman.cpp b/recman.cpp
index fb315d2..6a2fc00 100644
--- a/recman.cpp
+++ b/recman.cpp
@@ -383,7 +383,11 @@ namespace vdrlive {
time_t RecordingsItemRec::StartTime() const
{
+#if VDRVERSNUM < 10726
return m_recording->start;
+#else
+ return m_recording->Start();
+#endif
}
long RecordingsItemRec::Duration() const

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/vdr-live-0.2.0.20120114.ebuild,v 1.2 2012/03/09 23:25:19 hd_brummy Exp $
# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/vdr-live-0.2.0.20120114-r1.ebuild,v 1.1 2012/04/02 20:30:50 idl0r Exp $
EAPI="4"
@ -55,6 +55,8 @@ src_prepare() {
if ! has_version ">=media-video/vdr-1.7.13"; then
sed -i "s:-include \$(VDRDIR)/Make.global:#-include \$(VDRDIR)/Make.global:" Makefile
fi
epatch "${FILESDIR}/vdr-1.7.27-compatibility.patch"
}
src_install() {
@ -78,7 +80,7 @@ pkg_postinst() {
elog "On first install use login:pass"
elog "\tadmin:live"
ewarn "\t\tWARNiNG!!!"
ewarn "\t\tWARNING!!!"
ewarn "This is a developer snapshot"
einfo "On problems, use the stable amd64, x86 versions of"
einfo "dev-libs/tntnet dev-libs/cxxtools media-plugins/vdr-live"
@ -100,12 +102,11 @@ pkg_postinst() {
}
pkg_config() {
make_live_cert
local base=$(get_base 1)
local keydir="/etc/vdr/plugins/live"
install -d "${ROOT}${keydir}"
install -m0400 "${base}.key" "${ROOT}${keydir}/live.key"
install -m0444 "${base}.crt" "${ROOT}${keydir}/live.crt"
chown vdr:vdr "${ROOT}"/etc/vdr/plugins/live/live.*
make_live_cert
local base=$(get_base 1)
local keydir="/etc/vdr/plugins/live"
install -d "${ROOT}${keydir}"
install -m0400 "${base}.key" "${ROOT}${keydir}/live.key"
install -m0444 "${base}.crt" "${ROOT}${keydir}/live.crt"
chown vdr:vdr "${ROOT}"/etc/vdr/plugins/live/live.*
}

@ -1,2 +1,3 @@
DIST ncmpcpp-0.5.10.tar.bz2 381162 RMD160 da794649ae36509a385cf04a065af6b971561dbe SHA1 5e34733e7fbaf2862f04fdf8af8195ce860a9014 SHA256 ff6d5376a2d9caba6f5bb78e68af77cefbdb2f04cd256f738e39f8ac9a79a4a8
DIST ncmpcpp-0.5.8.tar.bz2 373853 RMD160 4b46bb793edc95d8e7d1d01fd135696c5e1e5e96 SHA1 2402a6e333484d64011d0135ea6659dc784adc5a SHA256 9d52e5c6192945aff2942acada37d52592441b8f786aae46f9c94147f4b373cd
DIST ncmpcpp-0.5.9.tar.bz2 380741 RMD160 b15c77f59ad0e8c38b9080606a8cba9c9cbc5266 SHA1 0702fca8b16a667c03cbf3abd9fc18c43109eef8 SHA256 3c66e9f280618e0c50671a19ff5b14e11d6b64c7b4a54edc2bbd0b1685d113bb

@ -0,0 +1,74 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpcpp/ncmpcpp-0.5.10.ebuild,v 1.1 2012/04/02 11:51:03 jer Exp $
EAPI="4"
inherit bash-completion-r1 eutils
DESCRIPTION="An ncurses mpd client, ncmpc clone with some new features, written in C++"
HOMEPAGE="http://unkart.ovh.org/ncmpcpp"
SRC_URI="http://unkart.ovh.org/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
IUSE="bash-completion clock curl fftw iconv outputs taglib unicode visualizer"
SLOT="0"
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
RDEPEND="
sys-libs/ncurses[unicode?]
>=media-libs/libmpdclient-2.1
curl? ( net-misc/curl )
visualizer? ( fftw? ( sci-libs/fftw:3.0 ) )
iconv? ( virtual/libiconv )
taglib? ( media-libs/taglib )
"
DEPEND="
${RDEPEND}
dev-util/pkgconfig
"
src_configure() {
local myconf=""
if use fftw; then
myconf="$(use_with visualizer fftw)"
if ! use visualizer; then
ewarn "For the fftw USE flag to have any effect, you must also"
ewarn "enable the visualizer USE flag."
fi
else
myconf="--without-fftw"
fi
econf \
${myconf} \
$(use_enable clock) \
$(use_enable outputs) \
$(use_enable unicode) \
$(use_enable visualizer) \
$(use_with curl) \
$(use_with iconv) \
$(use_with taglib)
}
src_install() {
default
# use dodoc instead of upstream's doc install which does not compress
rm -rf "${D}"/usr/share/doc/${PN}
dodoc AUTHORS NEWS doc/config doc/keys
newbashcomp doc/${PN}-completion.bash ${PN}
}
pkg_postinst() {
echo
elog "Example configuration files have been installed at"
elog "${ROOT}usr/share/doc/${PF}"
elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/keys"
elog "as user configuration files."
echo
if use visualizer; then
elog "If you want to use the visualizer, you need mpd with fifo enabled."
echo
fi
}

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

Loading…
Cancel
Save