Sync with portage [Wed Apr 18 13:58:38 MSK 2012].

mhiretskiy
root 12 years ago
parent df9ab8e17b
commit df67fcd1c0

@ -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-accessibility/festival/festival-2.1.ebuild,v 1.9 2011/12/29 22:12:07 halcy0n Exp $
# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-2.1.ebuild,v 1.10 2012/04/17 13:22:28 neurogeek Exp $
EAPI="2"
inherit eutils toolchain-funcs
@ -28,8 +28,7 @@ KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
IUSE=""
DEPEND="~app-accessibility/speech-tools-2.1
>=sys-libs/ncurses-5.6-r2
>=media-libs/alsa-lib-1.0.23"
>=sys-libs/ncurses-5.6-r2"
RDEPEND="${DEPEND}"
S=${WORKDIR}/festival

@ -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-admin/apache-tools/apache-tools-2.2.22.ebuild,v 1.6 2012/04/08 16:39:46 armin76 Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.2.22.ebuild,v 1.8 2012/04/17 19:33:07 ranger Exp $
EAPI="4"
inherit flag-o-matic eutils
@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
IUSE="ssl"
RESTRICT="test"

@ -1,6 +1,4 @@
DIST augeas-0.5.2.tar.gz 1180120 RMD160 b54df925b266d594a37240db449a0c174bc6a279 SHA1 f96ea180033528a0c500773d579c121fa71a8c0d SHA256 decc7ce07f6134da4b0a2a1880152b1ac4817f4bfe65941aa2656b59d6e1c44d
DIST augeas-0.10.0.tar.gz 1676906 RMD160 a851d643a8589f36468bfbcbb1c8daeef40b4cf5 SHA1 6d1d7b4572c05748d537f3ff12c5ac8ceb6b49bd SHA256 ec111af06186216930176ebe5ecccdf7bf528528aee9acde1d5d70088484afca
DIST augeas-0.7.1.tar.gz 1346645 RMD160 f7288c7a570984d80fd423da800f5ab9040455a5 SHA1 3a06df4a83a5e7352ba9509e354ea2065812a52d SHA256 f45749251dbc382b89458bfa25ca1f4090520f4b853b77c854de3861e9f82636
DIST augeas-0.7.3.tar.gz 1386027 RMD160 fa50cec34d3b353ae340085e51c9c9562e86a306 SHA1 35f3e19468aa08658aaf48daef7c476dce51ecf1 SHA256 10be72446699fdcaad66e800bd83a74b4af4da40348eaca04effd8677c11514a
DIST augeas-0.7.4.tar.gz 1387927 RMD160 d07a94672382ccc9fb47052523fff9708c075ff7 SHA1 bf42bb9329f266371f497f5168aa572a22c2916c SHA256 02ba7b4f1d0796dff6ea5f8cc5f4949e4ba30b7fa2f36a0c8a5079f9975060d1
DIST augeas-0.8.1.tar.gz 1605455 RMD160 c06c20e0254c64a46d2b257287d445b67c67af92 SHA1 b76b381a4a006e362829a2a384c42108e4f910cd SHA256 916fef67e8eed6d1abe02433830301bd01dfc8228e9cfffb490347545155c4d7
DIST augeas-0.9.0.tar.gz 1630073 RMD160 f4c7897ebe81069f66e8ca865503124e953443da SHA1 a2f9197ba9006e9b355e33a038759c8cbbcc289b SHA256 55d2f482d02ac4cb38a80d95c53d2f73de435df7df1022827e7cba20bb4bb9b8

@ -1,8 +1,9 @@
# 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-admin/augeas/augeas-0.8.1.ebuild,v 1.1 2011/05/11 14:41:14 matsuu Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/augeas/augeas-0.10.0.ebuild,v 1.1 2012/04/17 15:55:48 matsuu Exp $
EAPI="3"
EAPI="4"
inherit eutils
DESCRIPTION="A library for changing configuration files"
HOMEPAGE="http://augeas.net/"
@ -13,8 +14,10 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
IUSE="static-libs test"
RDEPEND="sys-libs/readline"
RDEPEND="sys-libs/readline
dev-libs/libxml2"
DEPEND="${RDEPEND}
dev-util/pkgconfig
>=app-doc/NaturalDocs-1.40
test? ( dev-lang/ruby )"
@ -32,9 +35,9 @@ src_configure() {
}
src_install() {
emake DESTDIR="${D}" install || die "install failed"
default
use static-libs || find "${ED}" -name '*.la' -exec rm {} +
use static-libs || find "${ED}" -name '*.la' -delete
dodoc AUTHORS ChangeLog README NEWS || die
dodoc AUTHORS ChangeLog README NEWS
}

@ -1,35 +0,0 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/augeas/augeas-0.5.2.ebuild,v 1.4 2009/10/10 14:59:01 armin76 Exp $
DESCRIPTION="A library for changing configuration files"
HOMEPAGE="http://augeas.net/"
SRC_URI="http://augeas.net/download/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ppc sparc x86"
IUSE="test"
RDEPEND="sys-libs/readline"
DEPEND="${RDEPEND}
>=app-doc/NaturalDocs-1.40
test? ( dev-lang/ruby )"
src_compile() {
if [ -f /usr/share/NaturalDocs/Config/Languages.txt ] ; then
addwrite /usr/share/NaturalDocs/Config/Languages.txt
fi
if [ -f /usr/share/NaturalDocs/Config/Topics.txt ] ; then
addwrite /usr/share/NaturalDocs/Config/Topics.txt
fi
econf || die
emake || die
}
src_install() {
emake DESTDIR="${D}" install || die "install failed"
dodoc AUTHORS ChangeLog README NEWS
}

@ -1,35 +0,0 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/augeas/augeas-0.7.3.ebuild,v 1.1 2010/09/06 17:39:15 matsuu Exp $
DESCRIPTION="A library for changing configuration files"
HOMEPAGE="http://augeas.net/"
SRC_URI="http://augeas.net/download/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
IUSE="test"
RDEPEND="sys-libs/readline"
DEPEND="${RDEPEND}
>=app-doc/NaturalDocs-1.40
test? ( dev-lang/ruby )"
src_compile() {
if [ -f /usr/share/NaturalDocs/Config/Languages.txt ] ; then
addwrite /usr/share/NaturalDocs/Config/Languages.txt
fi
if [ -f /usr/share/NaturalDocs/Config/Topics.txt ] ; then
addwrite /usr/share/NaturalDocs/Config/Topics.txt
fi
econf || die
emake || die
}
src_install() {
emake DESTDIR="${D}" install || die "install failed"
dodoc AUTHORS ChangeLog README NEWS
}

@ -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-admin/eselect-sh/eselect-sh-0.3.ebuild,v 1.7 2012/04/15 18:16:49 armin76 Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-sh/eselect-sh-0.3.ebuild,v 1.8 2012/04/17 16:15:03 ranger Exp $
EAPI=4
@ -10,7 +10,7 @@ SRC_URI="mirror://github/mgorny/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
src_install() {

@ -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-admin/puppet/puppet-2.7.13.ebuild,v 1.5 2012/04/16 17:09:32 ranger Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.13.ebuild,v 1.6 2012/04/16 20:42:02 jdhore Exp $
EAPI="4"
# ruby19: dev-ruby/ruby-ldap has no ruby19
@ -24,7 +24,7 @@ HOMEPAGE="http://puppetlabs.com/"
LICENSE="Apache-2.0"
SLOT="0"
IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs"
KEYWORDS="amd64 hppa ppc ~sparc ~x86"
KEYWORDS="amd64 hppa ppc ~sparc x86"
ruby_add_rdepend "
>=dev-ruby/facter-1.5.6

@ -1,51 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/xarchiver/xarchiver-0.5.2-r2.ebuild,v 1.12 2011/05/19 22:17:18 ssuominen Exp $
EAPI=4
inherit xfconf
DESCRIPTION="a GTK+ based and advanced archive manager that can be used with Thunar"
HOMEPAGE="http://xarchiver.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
IUSE="debug"
RDEPEND=">=x11-libs/gtk+-2.10:2
>=dev-libs/glib-2.10:2"
DEPEND="${RDEPEND}
dev-util/intltool
dev-util/pkgconfig"
pkg_setup() {
PATCHES=(
"${FILESDIR}"/${P}-stack-smash.patch
"${FILESDIR}"/${P}-add_xz_support.patch
)
XFCONF=( $(xfconf_use_debug) )
DOCS=( AUTHORS ChangeLog NEWS README TODO )
}
src_prepare() {
sed -i -e '/COPYING/d' doc/Makefile.in || die
xfconf_src_prepare
}
src_install() {
xfconf_src_install DOCDIR="${ED}/usr/share/doc/${PF}"
}
pkg_postinst() {
xfconf_pkg_postinst
elog "You need external programs for some formats, including"
elog "7zip - app-arch/p7zip"
elog "arj - app-arch/unarj app-arch/arj"
elog "lha - app-arch/lha"
elog "lzop - app-arch/lzop"
elog "rar - app-arch/unrar app-arch/rar"
elog "zip - app-arch/unzip app-arch/zip"
}

@ -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-backup/rsnapshot/rsnapshot-1.3.1-r1.ebuild,v 1.3 2011/05/28 15:30:40 mr_bones_ Exp $
# $Header: /var/cvsroot/gentoo-x86/app-backup/rsnapshot/rsnapshot-1.3.1-r1.ebuild,v 1.4 2012/04/18 02:12:29 darkside Exp $
EAPI=4
@ -12,7 +12,7 @@ SRC_URI="http://www.rsnapshot.org/downloads/${P}.tar.gz"
SLOT="0"
LICENSE="GPL-2"
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
IUSE=""
RDEPEND=">=dev-lang/perl-5.8.2

@ -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-benchmarks/iozone/iozone-3.397.ebuild,v 1.6 2012/03/25 14:56:58 armin76 Exp $
# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/iozone/iozone-3.397.ebuild,v 1.7 2012/04/16 21:18:13 ranger Exp $
# TODO
# -> linux-arm (32bit) <-
@ -27,7 +27,7 @@ SRC_URI="http://www.iozone.org/src/current/${PN}${PV/./_}.tar"
LICENSE="freedist"
SLOT="0"
KEYWORDS="amd64 arm ia64 ~ppc ppc64 sparc x86"
KEYWORDS="amd64 arm ia64 ppc ppc64 sparc x86"
IUSE=""
S=${WORKDIR}/${PN}${PV/./_}

@ -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-cdr/bchunk/bchunk-1.2.0-r1.ebuild,v 1.3 2011/12/26 12:38:29 maekke Exp $
# $Header: /var/cvsroot/gentoo-x86/app-cdr/bchunk/bchunk-1.2.0-r1.ebuild,v 1.4 2012/04/16 21:08:43 ranger Exp $
inherit toolchain-funcs
@ -10,7 +10,7 @@ SRC_URI="http://he.fi/bchunk/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
KEYWORDS="amd64 ppc ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
DEPEND=""

@ -0,0 +1,12 @@
bug #412359
--- src/lib/krb5/krb/deltat.c 2011-09-06 14:34:32.000000000 +0300
+++ src/lib/krb5/krb/deltat.c 2012-04-17 23:15:11.405005256 +0300
@@ -77,6 +77,7 @@
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wuninitialized"
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif
#include <ctype.h>

@ -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-crypt/mit-krb5/mit-krb5-1.10.1-r2.ebuild,v 1.1 2012/04/11 13:52:50 eras Exp $
# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.10.1-r2.ebuild,v 1.2 2012/04/17 21:31:09 eras Exp $
EAPI=4
@ -39,6 +39,7 @@ src_unpack() {
src_prepare() {
epatch "${FILESDIR}/${P}_uninitialized_extra.patch"
epatch "${FILESDIR}/${P}_uninitialized_extra-2.patch"
epatch "${FILESDIR}/${P}_gcc470.patch"
}
src_configure() {

@ -0,0 +1,59 @@
--- trunk/kdesupport/qca/src/botantools/botan/botan/secmem.h 2012/01/14 16:09:19 1273507
+++ trunk/kdesupport/qca/src/botantools/botan/botan/secmem.h 2012/01/14 17:12:15 1273508
@@ -191,15 +191,15 @@
{
public:
MemoryVector<T>& operator=(const MemoryRegion<T>& in)
- { if(this != &in) set(in); return (*this); }
+ { if(this != &in) this->set(in); return (*this); }
MemoryVector(u32bit n = 0) { MemoryRegion<T>::init(false, n); }
MemoryVector(const T in[], u32bit n)
- { MemoryRegion<T>::init(false); set(in, n); }
+ { MemoryRegion<T>::init(false); this->set(in, n); }
MemoryVector(const MemoryRegion<T>& in)
- { MemoryRegion<T>::init(false); set(in); }
+ { MemoryRegion<T>::init(false); this->set(in); }
MemoryVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)
- { MemoryRegion<T>::init(false); set(in1); append(in2); }
+ { MemoryRegion<T>::init(false); this->set(in1); append(in2); }
};
/*************************************************
@@ -210,15 +210,15 @@
{
public:
SecureVector<T>& operator=(const MemoryRegion<T>& in)
- { if(this != &in) set(in); return (*this); }
+ { if(this != &in) this->set(in); return (*this); }
SecureVector(u32bit n = 0) { MemoryRegion<T>::init(true, n); }
SecureVector(const T in[], u32bit n)
- { MemoryRegion<T>::init(true); set(in, n); }
+ { MemoryRegion<T>::init(true); this->set(in, n); }
SecureVector(const MemoryRegion<T>& in)
- { MemoryRegion<T>::init(true); set(in); }
+ { MemoryRegion<T>::init(true); this->set(in); }
SecureVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)
- { MemoryRegion<T>::init(true); set(in1); append(in2); }
+ { MemoryRegion<T>::init(true); this->set(in1); append(in2); }
};
/*************************************************
@@ -229,14 +229,14 @@
{
public:
SecureBuffer<T,L>& operator=(const SecureBuffer<T,L>& in)
- { if(this != &in) set(in); return (*this); }
+ { if(this != &in) this->set(in); return (*this); }
SecureBuffer() { MemoryRegion<T>::init(true, L); }
SecureBuffer(const T in[], u32bit n)
{ MemoryRegion<T>::init(true, L); copy(in, n); }
private:
SecureBuffer<T, L>& operator=(const MemoryRegion<T>& in)
- { if(this != &in) set(in); return (*this); }
+ { if(this != &in) this->set(in); return (*this); }
};
}

@ -1,8 +1,9 @@
# 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-crypt/qca/qca-2.0.3.ebuild,v 1.9 2011/09/14 19:11:21 grobian Exp $
# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-2.0.3.ebuild,v 1.10 2012/04/17 17:13:09 pesa Exp $
EAPI="3"
inherit eutils multilib qt4-r2
DESCRIPTION="Qt Cryptographic Architecture (QCA)"
@ -20,26 +21,24 @@ RDEPEND="${DEPEND}
!<app-crypt/qca-1.0-r3:0"
src_prepare() {
epatch "${FILESDIR}"/${PN}-2.0.2-pcfilespath.patch
epatch "${FILESDIR}"/${PN}-2.0.2-pcfilespath.patch \
"${FILESDIR}"/${P}+gcc-4.7.patch
if use aqua; then
sed -i \
-e "s|QMAKE_LFLAGS_SONAME =.*|QMAKE_LFLAGS_SONAME = -Wl,-install_name,|g" \
src/src.pro || die "Sed failed."
sed -i -e "s|QMAKE_LFLAGS_SONAME =.*|QMAKE_LFLAGS_SONAME = -Wl,-install_name,|g" \
src/src.pro || die
fi
}
src_configure() {
_libdir=$(get_libdir)
# Ensure proper rpath
export EXTRA_QMAKE_RPATH="${EPREFIX}/usr/${_libdir}/qca2"
export EXTRA_QMAKE_RPATH="${EPREFIX}/usr/$(get_libdir)/qca2"
ABI= ./configure \
--prefix="${EPREFIX}"/usr \
--qtdir="${EPREFIX}"/usr \
--includedir="${EPREFIX}"/usr/include/qca2 \
--libdir="${EPREFIX}"/usr/${_libdir}/qca2 \
--libdir="${EPREFIX}"/usr/$(get_libdir)/qca2 \
--certstore-path="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
--no-separate-debug-info \
--disable-tests \
@ -55,7 +54,7 @@ src_install() {
dodoc README TODO || die
cat <<-EOF > "${WORKDIR}"/44qca2
LDPATH="${EPREFIX}/usr/${_libdir}/qca2"
LDPATH="${EPREFIX}/usr/$(get_libdir)/qca2"
EOF
doenvd "${WORKDIR}"/44qca2 || die
@ -69,7 +68,7 @@ src_install() {
fi
# add the proper rpath for packages that do CONFIG += crypto
echo "QMAKE_RPATHDIR += \"${EPREFIX}/usr/${_libdir}/qca2\"" >> \
echo "QMAKE_RPATHDIR += \"${EPREFIX}/usr/$(get_libdir)/qca2\"" >> \
"${D%/}${EPREFIX}/usr/share/qt4/mkspecs/features/crypto.prf" \
|| die "failed to add rpath to crypto.prf"
}

@ -1,2 +1,3 @@
DIST sgeps-0_pre10.pl.bz2 1507 RMD160 41e5ac4196e5d1eb41c8487614daeea097b7cc9c SHA1 69b7132df2271f7fdb66b80d53e00e70210c4613 SHA256 546c3923cdaa97c6a38e0eb9478bae99af63cb0303d0a2088c9a9380e51243c7
DIST sgeps-0_pre12.pl.bz2 1812 RMD160 a311e60f72eaa29fd0ad126fc84f6d11b0391d64 SHA1 fee7eb1f5fbda5d250065d5b0f0a740d2af48c30 SHA256 7a969bf5b476c246a7d8c33be4405f0ab4e72193cc7acefc9bab9be0628da908
DIST sgeps-0_pre15.tar.xz 3284 RMD160 ddd5eab5b0e8959f4a58572dc3284926dc488400 SHA1 78dd1ba5d9428181478db72fbc715da2989412a0 SHA256 cc178d541e60d45ead8ca1183a31d68c425ad518de0bd7115bdb5b02e0bfb395

@ -0,0 +1,43 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-crypt/sgeps/sgeps-0_pre15.ebuild,v 1.1 2012/04/16 22:25:51 flameeyes Exp $
EAPI=4
DESCRIPTION="simple GnuPG-encrypted password store written in perl"
HOMEPAGE="http://roland.entierement.nu/blog/2010/01/22/simple-gnupg-encrypted-password-store.html"
SRC_URI="http://dev.gentoo.org/~flameeyes/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64"
IUSE="zsh-completion"
RDEPEND="app-crypt/gnupg
dev-lang/perl
virtual/perl-Storable
virtual/perl-File-Temp
virtual/perl-Getopt-Long
dev-perl/Config-Simple
zsh-completion? ( app-shells/zsh )"
DEPEND=""
S="${WORKDIR}"
src_install() {
dobin sgeps pwsafe2sgeps
if use zsh-completion ; then
insinto /usr/share/zsh/site-functions
newins zsh-completion _sgeps
fi
}
pkg_postinst() {
elog "To make use of sgeps, remember to create a configuration file as"
elog " ~/.config/sgeps.conf with these values:"
elog ""
elog "store = ~/somewhere/safe"
elog "keyid = 012345678"
elog ""
elog "If you want to use the --copy options you should install x11-misc/xclip"
}

@ -1 +1 @@
DIST ispell-pl-20021127.tar.gz 1019831 RMD160 010031d0c9b57c8c8bbb759886d1e13b377a644c SHA1 9e5efd7656f6f0747130380750fc93c9ab4b1e3e SHA256 879fa81299894007f4186a46ccd54715ae9d5c483b911d83205a0a9cf95821c6
DIST sjp-ispell-pl-20120417-src.tar.bz2 1146536 RMD160 1710e0d04c3760eb91bd86cc48fbf1da181843fc SHA1 b1bfe210fd4bb0a6f349a5197283790d3da396dd SHA256 65c1aa0fd65732573e92b86b7f2648bee77e0ffc5a6aec358ae3a4159119cd01

@ -1,12 +1,16 @@
# 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/app-dicts/ispell-pl/ispell-pl-20021127.ebuild,v 1.13 2008/11/23 17:35:06 jer Exp $
# $Header: /var/cvsroot/gentoo-x86/app-dicts/ispell-pl/ispell-pl-20120417.ebuild,v 1.1 2012/04/17 15:00:19 scarabeus Exp $
EAPI=4
MY_P="sjp-${P}"
inherit multilib
DESCRIPTION="Polish dictionary for ispell"
HOMEPAGE="http://ispell-pl.sourceforge.net/"
SRC_URI="mirror://sourceforge/ispell-pl/${P}.tar.gz"
HOMEPAGE="http://www.sjp.pl/slownik/en/"
SRC_URI="http://sjp.pl/slownik/ort/${MY_P}-src.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
@ -15,15 +19,15 @@ IUSE=""
DEPEND="app-text/ispell"
DICTBUILD="./zbuduj.slownik.sh"
S="${WORKDIR}/${MY_P}"
src_compile() {
sed "s/sort +1/sort -k 1/" -i zbuduj.slownik.sh
./zbuduj.slownik.sh || die
iconv -f iso8859-2 -t utf-8 polish.all -o polish.all.utf
./build polish.all.utf || die
}
src_install () {
insinto /usr/$(get_libdir)/ispell
doins polish.aff polish.hash || die
dodoc Changelog CZYTAJ.TO
doins polish.aff polish.hash
dodoc README
}

@ -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/bluefish/bluefish-2.2.2.ebuild,v 1.3 2012/04/10 11:37:06 scarabeus Exp $
# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/bluefish-2.2.2.ebuild,v 1.4 2012/04/16 20:59:49 ranger Exp $
EAPI=4
@ -15,7 +15,7 @@ SRC_URI="http://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2"
HOMEPAGE="http://bluefish.openoffice.nl/"
LICENSE="GPL-2"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
KEYWORDS="~alpha ~amd64 ~ia64 ppc ~ppc64 ~sparc ~x86"
SLOT="0"
IUSE="nls python spell"

@ -0,0 +1,75 @@
use standard AC_C_BIGENDIAN macro rather than trying to define it manually
--- a/configure.ac
+++ b/configure.ac
@@ -155,52 +155,24 @@ AC_SUBST(GSKI_CFLAGS)
AC_SUBST(GSKI_LIBS)
AM_CONDITIONAL(WITH_GTK_INTERFACE, test "x$with_gtk" = "xyes")
-dnl Target endianness
-AC_ARG_ENABLE(bigendian,
-AC_HELP_STRING([--enable-bigendian],
- [the target is big endian default=no]),
-ski_cv_c_target_bigendian=${enableval}, ski_cv_c_target_bigendian=no)
-
dnl Check for host endianness
AC_CACHE_CHECK([whether host byte ordering is defined in sys/param.h],
ski_cv_c_bigendian_compile,
[AC_TRY_COMPILE([
#include <sys/types.h>
#include <sys/param.h>
],[
#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
#error bogus endian macros
#endif
],
ski_cv_c_bigendian_compile=yes, ski_cv_c_bigendian_compile=no)])
if test "x$ski_cv_c_bigendian_compile" = xyes; then
AC_DEFINE(ENDIANESS_IN_SYS_PARAM_H, 1,
[define if sys/param.h defines the endiness])
-else
-AC_CACHE_CHECK([whether host byte ordering is big endian],
-ski_cv_c_bigendian,
-[AC_TRY_RUN([int main () {
- union {
- long l;
- char c[sizeof (long)];
- } u;
- u.l = 1;
- return (u.c[sizeof (long) - 1] == 1);
-}],
-ski_cv_c_bigendian=no, ski_cv_c_bigendian=yes,
-AC_MSG_ERROR([cannot detect host endianness]))])
-
-AC_DEFINE(BIG_ENDIAN, 4321, [define to 4321 if missing from sys/param.h])
-AC_DEFINE(LITTLE_ENDIAN, 1234, [define to 4321 if missing from sys/param.h])
-if test "x$ski_cv_c_bigendian" = xyes; then
- AC_DEFINE(BYTE_ORDER, 4321,
- [define to 4321 if host is big endian, 1234 if little endian])
-else
- AC_DEFINE(BYTE_ORDER, 1234,
- [define to 4321 if host is big endian, 1234 if little endian])
-fi
fi
+AC_C_BIGENDIAN
dnl Check for variables & functions
--- a/src/std.h
+++ b/src/std.h
@@ -62,6 +62,14 @@ extern unsigned long long __strtoull(const char *, char **, int);
# define BIG_ENDIAN 4321
# define LITTLE_ENDIAN 1234
# define BYTE_ORDER BIG_ENDIAN
+# else
+# define BIG_ENDIAN 4321
+# define LITTLE_ENDIAN 1234
+# ifdef WORDS_BIGENDIAN
+# define BYTE_ORDER BIG_ENDIAN
+# else
+# define BYTE_ORDER LITTLE_ENDIAN
+# endif
# endif /* !defined HAVE_CONFIG_H */
#endif /* !defined ENDIANESS_IN_SYS_PARAM_H */

@ -0,0 +1,22 @@
fix handling of 3rd/4th args to AC_ARG_WITH()
--- a/configure.ac
+++ b/configure.ac
@@ -130,7 +130,7 @@ dnl See if we build X11
AC_ARG_WITH(x11,
AC_HELP_STRING([--with-x11],
[Enable the Motif based X11 interface default=no]),
- [with_x11=yes],[with_x11=no])
+ [with_x11=$withval])
if test "x$with_x11" = "xyes"; then
dnl Check for motif, error out if not found
@@ -144,7 +144,7 @@ dnl See if we build GTK
AC_ARG_WITH(gtk,
AC_HELP_STRING([--with-gtk],
[Enable building the GTK Ski interface default=no]),
- [with_gtk=yes],[with_gtk=no]
+ [with_gtk=$withval]
)
if test "x$with_gtk" = "xyes"; then

@ -0,0 +1,13 @@
we don't link against libgnome, but we do gtk, so fix the pkg-config call
--- a/configure.ac
+++ b/configure.ac
@@ -148,7 +148,7 @@ AC_HELP_STRING([--with-gtk],
)
if test "x$with_gtk" = "xyes"; then
- PKG_CHECK_MODULES([GSKI], [libglade-2.0 libgnomeui-2.0 >= 1.110.0])
+ PKG_CHECK_MODULES([GSKI], [libglade-2.0 gtk+-2.0])
AC_DEFINE(HAVE_GTK, 1, [define if you have GTK support])
fi
AC_SUBST(GSKI_CFLAGS)

@ -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-emulation/ski/ski-1.3.2.ebuild,v 1.1 2012/04/16 05:04:45 vapier Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/ski/ski-1.3.2.ebuild,v 1.2 2012/04/17 04:01:05 vapier Exp $
EAPI="4"
@ -26,11 +26,16 @@ DEPEND="${RDEPEND}
sys-devel/flex
dev-util/gperf"
PATCHES=(
"${FILESDIR}"/${P}-syscall-linux-includes.patch
"${FILESDIR}"/${P}-remove-hayes.patch
"${FILESDIR}"/${P}-no-local-ltdl.patch
"${FILESDIR}"/${P}-AC_C_BIGENDIAN.patch
"${FILESDIR}"/${P}-configure-withval.patch
)
src_prepare() {
epatch \
"${FILESDIR}"/${P}-syscall-linux-includes.patch \
"${FILESDIR}"/${P}-remove-hayes.patch \
"${FILESDIR}"/${P}-no-local-ltdl.patch
epatch "${PATCHES[@]}"
rm -rf libltdl src/ltdl.[ch] macros/ltdl.m4
@ -40,6 +45,6 @@ src_prepare() {
src_configure() {
econf \
--without-included-ltdl \
$(use_enable gtk) \
$(use_enable motif x11)
$(use_with gtk) \
$(use_with motif x11)
}

@ -0,0 +1,49 @@
From 3d35aa0370d9c7bd455098caa9ba22ebe1f82968 Mon Sep 17 00:00:00 2001
From: Yong Sun <mail@yongsun.me>
Date: Wed, 4 Apr 2012 18:41:39 +0800
Subject: [PATCH] Integrated patch from YunQiang Su, fixed FTBFS with gcc-4.7
---
SConstruct | 3 ++-
src/portability.h | 5 ++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/SConstruct b/SConstruct
index 97abf47..354fd19 100644
--- a/SConstruct
+++ b/SConstruct
@@ -313,7 +313,8 @@ def DoConfigure():
conf.CheckCHeader('sys/param.h')
conf.CheckCHeader('sys/stat.h')
conf.CheckCHeader('sys/types.h')
- conf.CheckCHeader('unistd.h')
+ if conf.CheckCHeader('unistd.h'):
+ conf.Define('DHAVE_UNISTD_H', 1)
conf.CheckCHeader('wchar.h')
# add essential package requirements
diff --git a/src/portability.h b/src/portability.h
index 949d4f2..cf43bd0 100644
--- a/src/portability.h
+++ b/src/portability.h
@@ -44,15 +44,14 @@
#include <string>
#include <cstring>
-#if defined(sun)
+#if defined(HAVE_UNISTD_H)
#include <unistd.h>
#ifdef __cplusplus
#include <algorithm>
#else
#include <sys/ddi.h>
#endif //__cpluscplus
-#endif //defined(sun)
-
+#endif //defined(HAVE_UNISTD_H)
#ifndef HOST_OS_GNUC_2
#if defined(DEBUG) && !defined(NDEBUG)
--
1.7.8.5

@ -1,9 +1,10 @@
# 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-i18n/sunpinyin/sunpinyin-2.0.3-r1.ebuild,v 1.2 2011/04/17 09:03:04 qiaomuf Exp $
# $Header: /var/cvsroot/gentoo-x86/app-i18n/sunpinyin/sunpinyin-2.0.3-r1.ebuild,v 1.3 2012/04/18 01:30:59 qiaomuf Exp $
EAPI="1"
inherit eutils scons-utils
EAPI="3"
inherit eutils multilib scons-utils toolchain-funcs
DESCRIPTION="SunPinyin is a SLM (Statistical Language Model) based IME"
HOMEPAGE="http://sunpinyin.googlecode.com"
@ -24,15 +25,28 @@ src_unpack() {
unpack "${P}.tar.gz"
ln -s "${DISTDIR}/dict.utf8.tar.bz2" "${S}/raw/" || die "dict file not found"
ln -s "${DISTDIR}/lm_sc.t3g.arpa.tar.bz2" "${S}/raw/" || die "dict file not found"
cd "${S}" && epatch "${FILESDIR}/${P}-force-switch.patch"
}
src_prepare() {
epatch "${FILESDIR}/${P}-force-switch.patch"
epatch "${FILESDIR}/${P}-gcc-4.7.patch"
}
src_configure() {
tc-export CXX
myesconsargs=(
--prefix="${EPREFIX}"/usr
--libdir="${EPREFIX}"/usr/$(get_libdir)
--libdatadir="${EPREFIX}"/usr/lib
)
}
src_compile() {
escons --prefix="/usr" || die
escons || die
}
src_install() {
escons --prefix="/usr" --install-sandbox="${D}" install || die
escons --install-sandbox="${ED}" install || die
}
pkg_postinst() {

@ -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-misc/muttprint/muttprint-0.72d-r3.ebuild,v 1.5 2012/03/02 21:45:38 ranger Exp $
# $Header: /var/cvsroot/gentoo-x86/app-misc/muttprint/muttprint-0.72d-r3.ebuild,v 1.6 2012/04/16 21:17:20 ranger Exp $
EAPI=4
@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/muttprint/${P}.tar.gz"
SLOT="0"
LICENSE="GPL-2"
KEYWORDS="amd64 ~ppc ppc64 x86"
KEYWORDS="amd64 ppc ppc64 x86"
IUSE=""
RDEPEND="virtual/latex-base

@ -0,0 +1,20 @@
commit a8e97f672325557b3fbc84b987299350ec5ac10b
Author: Rex Dieter <rdieter@fedoraproject.org>
Date: Mon Jan 9 11:13:25 2012 -0600
gcc47 fix, unistd.h header required unconditionally for 'sleep'
diff --git a/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp b/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp
index 9fcdcb1..1e97599 100644
--- a/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp
+++ b/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp
@@ -27,9 +27,7 @@
#include <iostream>
#include <stdio.h>
-#if defined(__SUNPRO_CC)
#include <unistd.h>
-#endif
using namespace std;

@ -0,0 +1,91 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.7.7-r1.ebuild,v 1.1 2012/04/17 18:42:22 johu Exp $
EAPI=4
if [[ "${PV}" != "9999" ]]; then
SRC_URI="http://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
else
EGIT_REPO_URI="git://anongit.kde.org/strigi"
GIT_ECLASS="git-2"
EGIT_HAS_SUBMODULES="true"
KEYWORDS=""
fi
inherit cmake-utils ${GIT_ECLASS}
DESCRIPTION="Fast crawling desktop search engine with Qt4 GUI"
HOMEPAGE="https://projects.kde.org/projects/kdesupport/strigi/strigi"
LICENSE="GPL-2"
SLOT="0"
IUSE="clucene +dbus debug exif fam ffmpeg hyperestraier inotify log +qt4 test"
COMMONDEPEND="
app-arch/bzip2:0
dev-libs/libxml2:2
sys-libs/zlib:0
virtual/libiconv
clucene? ( >=dev-cpp/clucene-0.9.21[-debug] )
dbus? (
sys-apps/dbus
qt4? ( x11-libs/qt-dbus:4 )
)
exif? ( >=media-gfx/exiv2-0.17 )
fam? ( virtual/fam )
ffmpeg? ( virtual/ffmpeg )
hyperestraier? ( app-text/hyperestraier )
log? ( >=dev-libs/log4cxx-0.10.0 )
qt4? (
x11-libs/qt-core:4
x11-libs/qt-gui:4
)
"
DEPEND="${COMMONDEPEND}
dev-libs/boost
test? ( dev-util/cppunit )"
RDEPEND=${COMMONDEPEND}
PATCHES=( "${FILESDIR}/${P}-gcc47.patch" )
src_configure() {
# Enabled: POLLING (only reliable way to check for files changed.)
# Disabled: xine - recommended upstream to keep it this way
mycmakeargs=(
-DENABLE_POLLING=ON
-DFORCE_DEPS=ON
-DENABLE_CPPUNIT=OFF
-DENABLE_REGENERATEXSD=OFF
-DENABLE_XINE=OFF
$(cmake-utils_use_enable clucene CLUCENE)
$(cmake-utils_use_enable dbus)
$(cmake-utils_use_enable exif EXIV2)
$(cmake-utils_use_enable fam)
$(cmake-utils_use_enable ffmpeg)
$(cmake-utils_use_enable hyperestraier)
$(cmake-utils_use_enable inotify)
$(cmake-utils_use_enable log LOG4CXX)
$(cmake-utils_use_enable qt4)
$(cmake-utils_use_enable test CPPUNIT)
)
if use qt4; then
mycmakeargs+=(-DENABLE_DBUS=ON)
fi
cmake-utils_src_configure
}
pkg_postinst() {
if ! use clucene && ! use hyperestraier; then
echo
elog "Because you didn't enable either of the available backends:"
elog "clucene or hyperestraier, strigi may not be functional."
elog "If you intend to use standalone strigi indexer (not needed for KDE),"
elog "be sure to reinstall app-misc/strigi with either clucene (recommended)"
elog "or hyperestraier (unreliable) USE flag enabled."
echo
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/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.45 2012/04/06 10:57:26 scarabeus Exp $
# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.48 2012/04/17 11:26:30 scarabeus Exp $
EAPI=4
@ -211,12 +211,13 @@ REQUIRED_USE="
S="${WORKDIR}/${PN}-core-${PV}"
CHECKREQS_MEMORY="512M"
CHECKREQS_DISK_BUILD="6G"
pkg_pretend() {
local pgslot
if [[ ${MERGE_TYPE} != binary ]]; then
CHECKREQS_MEMORY="512M"
CHECKREQS_DISK_BUILD="6G"
check-reqs_pkg_pretend
if [[ $(gcc-major-version) -lt 4 ]]; then
@ -243,7 +244,7 @@ pkg_setup() {
python_set_active_version 2
python_pkg_setup
[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_pretend
[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
}
src_unpack() {
@ -300,6 +301,7 @@ src_prepare() {
fi
base_src_prepare
AT_M4DIR="m4"
eautoreconf
# hack in the autogen.sh
touch autogen.lastrun
@ -351,7 +353,6 @@ src_configure() {
if use branding; then
internal_libs+="
--with-about-bitmap="${WORKDIR}/branding-about.png"
--with-intro-bitmap="${WORKDIR}/branding-intro.png"
"
fi
@ -467,7 +468,8 @@ src_compile() {
}
src_test() {
make check || die
make unitcheck || die
make slowcheck || die
}
src_install() {

@ -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/lyx/lyx-2.0.3.ebuild,v 1.4 2012/04/15 14:05:14 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.0.3.ebuild,v 1.6 2012/04/17 20:17:06 jer Exp $
EAPI=3
@ -20,7 +20,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
KEYWORDS="~alpha amd64 hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
IUSE="cups debug nls +latex xetex luatex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant"
LANGS="ar ca cs de da el en es eu fi fr gl he hu ia id it ja nb nn pl pt ro ru sk sr sv tr uk zh_CN zh_TW"

@ -1,6 +1 @@
DIST orage-4.8.2-hr.po.bz2 15501 RMD160 25fb6d46c939eb00f22227bf144f8c619de2b0cd SHA1 4edff5af779df4d6c8b4a742265feb0bada10a66 SHA256 c4c30697afd44d1a70b08d1f0fad62c6bed67d67e05d2a841aa2aa54cd3329d5
DIST orage-4.8.2-kk.po.bz2 11770 RMD160 cef077592b30d572305aebe0f62048e0328961e9 SHA1 b97f3a417c15a068ff6cd8a440b520de561c96fc SHA256 ae55c0aaa154203664d4083e02d1b5d3c9f438f0a7332fcc6c49735c03526296
DIST orage-4.8.2-si.po.bz2 12933 RMD160 92db8d8f9eaa846348af0a2af2798a14db40cda0 SHA1 db3a1cba2c9c67e0d0163eac344c33400f718748 SHA256 dba638c192f54bbcf11aca733bc06c363df2b2463f1e0bc964278d86c53c0775
DIST orage-4.8.2-ug.po.bz2 16999 RMD160 ccd7f900131d3456357e2cae86406a7a073eb344 SHA1 2c3636fc939faed41a86a6d051c5eff901649e42 SHA256 d6f5703867eea5fada20d13296fb411c7408315c59fe56596f16120e963f95b8
DIST orage-4.8.2.tar.bz2 2453171 RMD160 8316423688cc5766c9b07d540230dc72c246405f SHA1 310c84f3787d88cf75ee7be0ceb96926bbbb7295 SHA256 51cc78f856331cdb5de25ae601efd26e70790a5a0797c139bdd1f2246dd2fdcc
DIST orage-4.8.3.tar.bz2 2438461 RMD160 640bd061f4e4031c38a2cdbed9e8cc804193117a SHA1 f4f89ea1f301514c419e7643661b510132ebb012 SHA256 9a5805c8a70de0cae67ae1a6282463bbd059d6a4d080f93ffb13f92aaacdbf2e

@ -1,55 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/orage/orage-4.8.2.ebuild,v 1.10 2012/03/21 06:25:51 ssuominen Exp $
EAPI=4
inherit flag-o-matic xfconf
DESCRIPTION="Xfce's calendar suite (with panel plug-in)"
HOMEPAGE="http://www.xfce.org/projects/orage/"
SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2
mirror://gentoo/${P}-hr.po.bz2
mirror://gentoo/${P}-kk.po.bz2
mirror://gentoo/${P}-si.po.bz2
mirror://gentoo/${P}-ug.po.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="berkdb dbus debug libnotify +xfce_plugins_clock"
RDEPEND=">=dev-libs/libical-0.43
dev-libs/popt
>=x11-libs/gtk+-2.10:2
berkdb? ( >=sys-libs/db-4 )
dbus? ( >=dev-libs/dbus-glib-0.90 )
libnotify? ( >=x11-libs/libnotify-0.7 )
xfce_plugins_clock? ( >=xfce-base/xfce4-panel-4.8 )"
DEPEND="${RDEPEND}
dev-util/pkgconfig
dev-util/intltool"
pkg_setup() {
append-flags -I/usr/include/libical
XFCONF=(
--docdir="${EPREFIX}"/usr/share/doc/${PF}/html
$(use_enable xfce_plugins_clock libxfce4panel)
$(use_enable dbus)
$(use_enable libnotify)
$(use_with berkdb bdb4)
$(xfconf_use_debug)
)
DOCS=( AUTHORS ChangeLog NEWS README TODO )
}
src_prepare() {
# http://git.xfce.org/apps/orage/commit/?id=e892679d5f924fac43fbab5087ecea080b57514f
local po
for po in hr kk si ug; do
mv -vf "${WORKDIR}"/${P}-${po}.po po/${po}.po || die
done
xfconf_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/app-office/pybliographer/pybliographer-1.2.14.ebuild,v 1.2 2012/04/05 20:42:02 phajdan.jr Exp $
# $Header: /var/cvsroot/gentoo-x86/app-office/pybliographer/pybliographer-1.2.14.ebuild,v 1.3 2012/04/17 16:06:21 ranger Exp $
EAPI="3"
PYTHON_DEPEND="2:2.6"
@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/pybliographer/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc x86"
KEYWORDS="~amd64 ppc x86"
IUSE=""
DOCS="AUTHORS ChangeLog* NEWS TODO README"

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

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

@ -1,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-portage/gentoolkit/gentoolkit-0.3.0.5.ebuild,v 1.6 2012/04/15 16:59:10 maekke Exp $
# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.5.ebuild,v 1.8 2012/04/17 19:43:10 ranger Exp $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
@ -20,7 +20,7 @@ IUSE=""
# Drop the prefix keywords since equery is currently broken on prefix Bug 406495
#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
# Note: argparse is provided in python 2.7 and 3.2 (Bug 346005)
# Note: dev-lang/python dependencies are so emerge will print a blocker if any

@ -1,5 +1,3 @@
DIST portpeek-1.9.70.tar.gz 8634 RMD160 3da26cddb24b4f6d7eb99d81e6ccef49b48d2224 SHA1 c0c4f49a8cc865313e842d1775d6dd74c21c25c8 SHA256 21a6edab38ea5c3cba99b27856f5f0918154c5d5f93286618c213f5385e32e2b
DIST portpeek-1.9.83.tar.gz 10535 RMD160 b9637e5cd4b8bb2237773227f2d5680af63cfc4c SHA1 541fe4a9f0c26348dc6121438c4f8860223b50a1 SHA256 882703c3b4646eb8f15d34af2d87d7e80ce14b8b15f47706760a84fb1f76cc02
DIST portpeek-2.0.17.tar.gz 10549 RMD160 9c29ac2e16408d007694efb63a9135a3b72b670b SHA1 64f402b8e3a847f09aacd04b47acbe08b5cefe5a SHA256 d060fabfc54fcb43cea508419d2e7f6b8c629914a9d97aaa5d850350c0f06ac4
DIST portpeek-2.0.18.tar.gz 10550 RMD160 d10fbbb8ce8b9f259ea4e54760e5cc4bdd2dfb38 SHA1 0bcd46ddc397bc1a3fc292994967041266a6c2be SHA256 cc62a3a1b04d6cbcf5ebea855a9dd962cd444912c84fc8750ad483b89b84ce8c
DIST portpeek-2.0.19.tar.gz 10562 RMD160 32f50b9fae464ca08fe372f4d32cc68de5d67584 SHA1 d75d2608953e0f94cbda87cc6feb2418bedccd3b SHA256 de2e033f642bae2cce5f0580ecbaf92cac7b9c25d72b226a113e67fab1c6dff3
DIST portpeek-2.0.20.tar.gz 10585 RMD160 ec5b157f7f6ea89bdf9a5e563c10dec877c19868 SHA1 79e08f3714cf633228b953364b13f4e341721363 SHA256 a7d7e391fd6ad134570035552345233d0e6329cc364d16c41cec228473908cc8

@ -1,26 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-portage/portpeek/portpeek-2.0.17.ebuild,v 1.2 2012/01/04 18:19:25 mpagano Exp $
EAPI="4"
PYTHON_DEPEND="*:2.7"
inherit python
DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
SRC_URI="http://www.mpagano.com/downloads/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd"
IUSE=""
DEPEND=""
RDEPEND=">=app-portage/gentoolkit-0.3.0.4-r5
>=sys-apps/portage-2.1.10.41"
src_install() {
dobin ${PN} || die "dobin failed"
doman *.[0-9]
}

@ -1,26 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-portage/portpeek/portpeek-2.0.18.ebuild,v 1.1 2012/02/02 11:37:32 mpagano Exp $
EAPI="4"
PYTHON_DEPEND="*:2.7"
inherit python
DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
SRC_URI="http://www.mpagano.com/downloads/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd"
IUSE=""
DEPEND=""
RDEPEND=">=app-portage/gentoolkit-0.3.0.4-r5
>=sys-apps/portage-2.1.10.41"
src_install() {
dobin ${PN} || die "dobin failed"
doman *.[0-9]
}

@ -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-portage/portpeek/portpeek-2.0.19.ebuild,v 1.1 2012/02/10 16:05:19 mpagano Exp $
# $Header: /var/cvsroot/gentoo-x86/app-portage/portpeek/portpeek-2.0.20.ebuild,v 1.1 2012/04/17 13:30:39 mpagano Exp $
EAPI="4"
PYTHON_DEPEND="*:2.7"
@ -17,8 +17,8 @@ KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd"
IUSE=""
DEPEND=""
RDEPEND=">=app-portage/gentoolkit-0.3.0.4-r5
>=sys-apps/portage-2.1.10.41"
RDEPEND=">=app-portage/gentoolkit-0.3.0.5
>=sys-apps/portage-2.1.10.49"
src_install() {
dobin ${PN} || die "dobin failed"

@ -1,2 +1,2 @@
DIST smart-live-rebuild-1.0.1.tar.bz2 16908 RMD160 6c36d71ae28729547bb3a646513d1c4048cac723 SHA1 c2680497e55958789a6a4a700b9ed69c0cd2f58c SHA256 2f82dd0ccf627c5f8c4316363d741390fb3774b22b265d4e2ff2a21124d8d56e
DIST smart-live-rebuild-1.2.1.tar.bz2 15767 RMD160 0305c981bdfcb43ab8f947ea5d26072766993b94 SHA1 dce7a00999663083643b90de153f8dc992616b21 SHA256 cd5666a34921dd612f76df5802f25ef3001986276459b741b66aa7111cc84de6
DIST smart-live-rebuild-1.2.3.tar.bz2 15753 RMD160 117335dd2ea2706213ad58d345c99c3ce418a860 SHA1 3a612fb5f4a67f78844bf4433e67a7fba99df674 SHA256 71080883018b4378d25ccb80d26cf973100f1df21e624c7c3fbfdbee3a31f035

@ -1,39 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-portage/smart-live-rebuild/smart-live-rebuild-1.0.1.ebuild,v 1.1 2011/06/27 10:03:39 mgorny Exp $
EAPI=3
PYTHON_DEPEND='*:2.6'
SUPPORT_PYTHON_ABIS=1
RESTRICT_PYTHON_ABIS='2.4 2.5'
#DISTUTILS_SRC_TEST=setup.py # tests fail with py3k right now
inherit base distutils
DESCRIPTION="Check live packages for updates and emerge them as necessary"
HOMEPAGE="https://github.com/mgorny/smart-live-rebuild/"
SRC_URI="http://cloud.github.com/downloads/mgorny/${PN}/${P}.tar.bz2"
LICENSE="BSD-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND=">=sys-apps/portage-2.1.8.3"
PYTHON_MODNAME=smartliverebuild
src_prepare() {
base_src_prepare
distutils_src_prepare
}
src_install() {
distutils_src_install
insinto /etc/portage
newins smart-live-rebuild.conf{.example,} || die
insinto /usr/share/portage/config/sets
newins sets.conf.example ${PN}.conf || die
}

@ -0,0 +1,40 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-portage/smart-live-rebuild/smart-live-rebuild-1.2.3.ebuild,v 1.1 2012/04/17 16:07:52 mgorny Exp $
EAPI=4
PYTHON_DEPEND='2:2.6'
SUPPORT_PYTHON_ABIS=1
RESTRICT_PYTHON_ABIS='2.4 2.5 3.*'
DISTUTILS_SRC_TEST=setup.py
inherit base distutils
DESCRIPTION="Check live packages for updates and emerge them as necessary"
HOMEPAGE="https://bitbucket.org/mgorny/smart-live-rebuild/"
SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2"
LICENSE="BSD-2"
SLOT="0"
KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd"
IUSE=""
RDEPEND=">=app-portage/gentoopm-0.2.1
!sys-apps/portage[python3]"
PYTHON_MODNAME=smartliverebuild
src_prepare() {
base_src_prepare
distutils_src_prepare
}
src_install() {
distutils_src_install
insinto /etc/portage
newins smart-live-rebuild.conf{.example,}
insinto /usr/share/portage/config/sets
newins sets.conf.example ${PN}.conf
}

@ -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-text/acroread/acroread-9.5.1.ebuild,v 1.3 2012/04/13 09:09:32 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.5.1.ebuild,v 1.4 2012/04/17 11:28:32 ssuominen Exp $
EAPI=4
@ -43,8 +43,7 @@ RDEPEND="media-libs/fontconfig
cups? ( net-print/cups )
x86? ( x11-libs/gtk+:2 net-dns/libidn
ldap? ( net-nds/openldap )
!minimal? ( || ( net-libs/xulrunner
www-client/firefox
!minimal? ( || ( www-client/firefox
www-client/seamonkey ) ) )
amd64? ( app-emulation/emul-linux-x86-gtklibs app-emulation/emul-linux-x86-baselibs )
linguas_zh_CN? ( media-fonts/acroread-asianfonts[linguas_zh_CN] )
@ -221,7 +220,7 @@ src_install() {
# We need to set a MOZILLA_COMP_PATH for seamonkey and firefox since
# they don't install a configuration file for libgtkembedmoz.so
# detection in /etc/gre.d/ like xulrunner does.
# detection in /etc/gre.d/ like xulrunner did.
if ! use minimal ; then
if use x86 ; then
for lib in /opt/seamonkey /usr/lib/seamonkey /usr/lib/mozilla-firefox ; do

@ -1,5 +1,2 @@
DIST ispell-3.2.06-r6-gentoo-0.1.diff.bz2 8787 RMD160 d821b99da52ed9d326d653d0bf01b277c30c18ab SHA1 46472cdb0d59efea3dc438fd098d6de7345ce9b5 SHA256 e577e996cb465222ae3c12f53e0a712d97a1c5f3786eaab51d28769f3a9af114
DIST ispell-3.2.06.tar.gz 580742 RMD160 3f6a3840540ebc753146c427da8ce2d54317b46e SHA1 35f496322cda172d56610417e4e1c7b962f734d7 SHA256 34a27fc4a2089bd5074aacf69323731770e5b605a2fc9a053d389f45b01c7966
DIST ispell-3.3.02-gentoo-0.2.diff.bz2 5723 RMD160 6c76be7b90ae65196c9ef5dcd89406e03705374c SHA1 631f1aaca6029ebd6d01df6a00541172ef1e6f8a SHA256 22f50af967290f46bf357bc54ad9fa7de433868632a65e8fc5b148e1a55ec218
DIST ispell-3.3.02-gentoo-0.3.diff.bz2 5912 RMD160 abd9fc91cf01b301f8532ce06b15880d57edbf3c SHA1 287c34bcde66d10592413cc4d6acf042f72613f1 SHA256 2ab38d0228b2aa4ec98f69ee1890c314c8d4e4f76d0614fb874e15ac60964d9d
DIST ispell-3.3.02.tar.gz 619813 RMD160 12edc94ebb7c1f4040bd8f5b0dbb8f40326aa781 SHA1 c0d98e1af3afb8e0b642717c03439ff8881e3d60 SHA256 7ff5aad2722ad80fa86766218b7bc622b25bad2d765ea942ba93c996b113ecb4

@ -1,190 +0,0 @@
diff -Naur ispell-3.2.06-old/Makefile ispell-3.2.06/Makefile
--- ispell-3.2.06-old/Makefile 2003-12-13 23:59:07.000000000 +0000
+++ ispell-3.2.06/Makefile 2003-12-13 23:59:23.000000000 +0000
@@ -415,7 +415,7 @@
cat config.X local.h \
| sed -n -e "s/^#define[ ]*$$var[ ]*"'"'"/$$var=/p" \
| sed -e 's/".*$$/'"'/" -e "s/=/='/" \
- | tail -1; \
+ | tail -n 1; \
done > config.sh; \
echo 'case "$$MAKE_SORTTMP" in "") \
SORTTMP="-e /!!SORTTMP!!/s/=.*$$/=/";; *) SORTTMP=;; esac' \
diff -Naur ispell-3.2.06-old/Makepatch ispell-3.2.06/Makepatch
--- ispell-3.2.06-old/Makepatch 2003-12-13 23:59:07.000000000 +0000
+++ ispell-3.2.06/Makepatch 2003-12-13 23:59:23.000000000 +0000
@@ -141,7 +141,7 @@
if [ -r "$destdir/Patch${baserelease}.01" ]
then
- lastpatch=`ls $destdir/Patch${baserelease}.?? | tail -1 \
+ lastpatch=`ls $destdir/Patch${baserelease}.?? | tail -n 1 \
| sed "s;$destdir/Patch${baserelease}.;;"`
else
lastpatch=00
diff -Naur ispell-3.2.06-old/findaffix.X ispell-3.2.06/findaffix.X
--- ispell-3.2.06-old/findaffix.X 2003-12-13 23:59:07.000000000 +0000
+++ ispell-3.2.06/findaffix.X 2003-12-13 23:59:23.000000000 +0000
@@ -152,7 +152,7 @@
elimlen=1
lowcount=10
cleanout=no
-finalsortopts='+3rn -4 +2rn -3 +1 -2 +0 -1'
+finalsortopts='-k 4rn,5 -k 3rn,4 -k 2,3 -k 1,2'
tabch=/
while :
do
@@ -177,7 +177,7 @@
shift
;;
-f)
- finalsortopts='+2rn -3 +3rn -4 +1 -2 +0 -1'
+ finalsortopts='-k 3rn,4 -k 4rn,5 -k 2,3 -k 1,2'
shift
;;
-c)
@@ -256,10 +256,10 @@
next
'"$LOOP"'
}' < ${TMP}a \
- | sort "-t$tabch" +0 -1 +1 $SORTTMP -o ${TMP}a
+ | sort "-t$tabch" -k 1,2 -k 2 $SORTTMP -o ${TMP}a
join "-t$tabch" -o 1.2 2.2 2.3 ${TMP}a ${TMP}a \
| awk "-F$tabch" "BEGIN{elimlen=$elimlen}$ELIM" \
- | sort "-t$tabch" +1 -2 +0 -1 $SORTTMP \
+ | sort "-t$tabch" -k 2,3 -k 1,2 $SORTTMP \
| awk "-F$tabch" 'BEGIN{tabch="'"$tabch"'"; lowcount='"$lowcount"'}
{
if ($1 == last1 && $2 == last2)
diff -Naur ispell-3.2.06-old/languages/english/Makefile ispell-3.2.06/languages/english/Makefile
--- ispell-3.2.06-old/languages/english/Makefile 2003-12-13 23:59:07.000000000 +0000
+++ ispell-3.2.06/languages/english/Makefile 2003-12-14 00:01:15.000000000 +0000
@@ -336,7 +336,7 @@
done; \
trap "rm -f english.sml" 1 2 15; \
set -x; \
- eval sort -u -t/ +0f -1 +0 $$MAKE_SORTTMP -o english.sml $$dicts
+ eval sort -u -t/ -k 1f,2 -k 1 $$MAKE_SORTTMP -o english.sml $$dicts
$(DBUILD)english.sml+: $(CONFIG) $(EXTRADICT)
$(DBUILD)english.sml+: english.0
@@ -376,7 +376,7 @@
done; \
trap "rm -f english.med" 1 2 15; \
set -x; \
- eval sort -u -t/ +0f -1 +0 $$MAKE_SORTTMP -o english.med $$dicts
+ eval sort -u -t/ -k 1f,2 -k 1 $$MAKE_SORTTMP -o english.med $$dicts
$(DBUILD)english.med+: $(CONFIG) $(EXTRADICT)
$(DBUILD)english.med+: english.0
@@ -424,7 +424,7 @@
done; \
trap "rm -f english.lrg" 1 2 15; \
set -x; \
- eval sort -u -t/ +0f -1 +0 $$MAKE_SORTTMP -o english.lrg $$dicts
+ eval sort -u -t/ -k 1f,2 -k 1 $$MAKE_SORTTMP -o english.lrg $$dicts
$(DBUILD)english.lrg+: $(CONFIG) $(EXTRADICT)
$(DBUILD)english.lrg+: english.0
@@ -477,7 +477,7 @@
done; \
trap "rm -f english.xlg" 1 2 15; \
set -x; \
- eval sort -u -t/ +0f -1 +0 $$MAKE_SORTTMP -o english.xlg $$dicts
+ eval sort -u -t/ -k 1f,2 -k 1 $$MAKE_SORTTMP -o english.xlg $$dicts
$(DBUILD)english.xlg+: $(CONFIG) $(EXTRADICT)
$(DBUILD)english.xlg+: english.0
diff -Naur ispell-3.2.06-old/munchlist.X ispell-3.2.06/munchlist.X
--- ispell-3.2.06-old/munchlist.X 2003-12-13 23:59:07.000000000 +0000
+++ ispell-3.2.06/munchlist.X 2003-12-13 23:59:23.000000000 +0000
@@ -422,7 +422,7 @@
cat "$@" | $ISPELL "$wchars" -e1 -d $FAKEHASH -p /dev/null | tr " " '
'
fi \
- | sort $SORTTMP -u +0f -1 +0 \
+ | sort $SORTTMP -u -k 1f,2 -k 1 \
| $COMBINE $icflags $langtabs \
| sort $SORTTMP -u > $EXPANDEDINPUT
#
@@ -482,7 +482,7 @@
$ISPELL "$wchars" -c -W0 -d $FAKEHASH -p /dev/null < $STRIPPEDINPUT \
| tr " " '
' \
- | egrep "$flagmarker" | sort $SORTTMP -u "-t$flagmarker" +0 -1 +1 \
+ | egrep "$flagmarker" | sort $SORTTMP -u "-t$flagmarker" -k 1,2 -k 2 \
| $JOIN $SIGNED "-t$flagmarker" - $EXPANDEDINPUT > $CRUNCHEDINPUT
#
# We now have a list of legal roots, and of affixes that apply to the
@@ -508,7 +508,7 @@
#
$verbose && echo 'Expanding dictionary into EXPANDEDPAIRS.' 1>&2
$ISPELL "$wchars" -e3 -d $FAKEHASH -p /dev/null < $CRUNCHEDINPUT \
- | sort $SORTTMP +1 > $EXPANDEDPAIRS
+ | sort $SORTTMP -k 2 > $EXPANDEDPAIRS
#
# Now we want to extract the lines in EXPANDEDPAIRS in which the second field
# is *not* listed in the original dictionary EXPANDEDINPUT; these illegal
@@ -536,7 +536,7 @@
| (sed -e 's; .*$;;' ; /bin/rm -f $JOINEDPAIRS $EXPANDEDPAIRS) \
| uniq \
| (comm -13 - $CRUNCHEDINPUT ; /bin/rm -f $CRUNCHEDINPUT) \
- | sort $SORTTMP -u "-t$flagmarker" +0f -1 +0 \
+ | sort $SORTTMP -u "-t$flagmarker" -k 1f,2 -k 1 \
| $COMBINE $langtabs > $LEGALFLAGLIST
#
@@ -566,7 +566,7 @@
| sort $SORTTMP \
| uniq -c \
| tr ' ' ' ' \
- | sort $SORTTMP +0rn -1 +2 > $PRODUCTLIST
+ | sort $SORTTMP -k 1rn,2 -k 3 > $PRODUCTLIST
if [ `egrep ' p ' $PRODUCTLIST | wc -l` -gt 0 \
-a `egrep ' s ' $PRODUCTLIST | wc -l` -gt 0 ]
@@ -681,7 +681,7 @@
#
$verbose && echo "Creating cross expansions (pass $dbnum)." 1>&2
$ISPELL "$wchars" -e3 -d $FAKEHASH -p /dev/null < $CROSSROOTS \
- | sort $SORTTMP +1 > $CROSSEXPANDED
+ | sort $SORTTMP -k 2 > $CROSSEXPANDED
#
# Now we join CROSSEXPANDED against EXPANDEDINPUT to produce
# CROSSPAIRS, and then comm that against CROSSEXPANDED to
@@ -765,7 +765,7 @@
D
}' \
| comm -23 - $ILLEGALCOMBOS \
- | sort $SORTTMP -u "-t$flagmarker" +0f -1 +0 \
+ | sort $SORTTMP -u "-t$flagmarker" -k 1f,2 -k 1 \
| $COMBINE $langtabs > $CROSSROOTS
mv $CROSSROOTS $LEGALFLAGLIST
if [ "$debug" = yes ]
@@ -801,10 +801,10 @@
#
$verbose && echo 'Eliminating non-optimal affixes.' 1>&2
$ISPELL "$wchars" -e4 -d $FAKEHASH -p /dev/null < $LEGALFLAGLIST \
- | sort $SORTTMP +1 -2 +2rn -3 +0 -1 \
- | sort $SORTTMP -um +1 -2 \
+ | sort $SORTTMP -k 2,3 -k 3rn,4 -k 1,2 \
+ | sort $SORTTMP -um -k 2,3 \
| sed -e 's; .*$;;' \
- | sort $SORTTMP -u "-t$flagmarker" +0f -1 +0 > $MINIMALAFFIXES
+ | sort $SORTTMP -u "-t$flagmarker" -k 1f,2 -k 1 > $MINIMALAFFIXES
/bin/rm -f $LEGALFLAGLIST
#
# Now we're almost done. MINIMALAFFIXES covers some (with luck, most)
@@ -832,10 +832,10 @@
fi
($ISPELL "$wchars" -l -d $FAKEHASH -p /dev/null < $STRIPPEDINPUT; \
$COMBINE $langtabs < $MINIMALAFFIXES) \
- | sort $SORTTMP "-t$flagmarker" -u +0f -1 +0
+ | sort $SORTTMP "-t$flagmarker" -u -k 1f,2 -k 1
else
# MINIMALAFFIXES is empty; just produce a sorted version of STRIPPEDINPUT
- sort $SORTTMP "-t$flagmarker" -u +0f -1 +0 $STRIPPEDINPUT
+ sort $SORTTMP "-t$flagmarker" -u -k 1f,2 -k 1 $STRIPPEDINPUT
fi
/bin/rm -f ${TMP}*
if [ "X$MUNCHMAIL" != X ]

@ -1,30 +0,0 @@
diff -Naur ispell-3.2.06.orig/Makefile ispell-3.2.06/Makefile
--- ispell-3.2.06.orig/Makefile 2007-08-18 15:15:59.000000000 +0200
+++ ispell-3.2.06/Makefile 2007-08-18 15:17:44.000000000 +0200
@@ -254,7 +254,6 @@
@. ./config.sh; \
set -x; \
cd $$BINDIR; \
- strip ispell; \
chmod 755 ispell
@. ./config.sh; \
set -x; \
@@ -294,7 +293,6 @@
@. ./config.sh; \
set -x; \
cd $$BINDIR; \
- strip buildhash icombine ijoin sq unsq; \
chmod 755 buildhash icombine ijoin \
munchlist findaffix tryaffix sq unsq
@. ./config.sh; \
diff -Naur ispell-3.2.06.orig/deformatters/Makefile ispell-3.2.06/deformatters/Makefile
--- ispell-3.2.06.orig/deformatters/Makefile 2001-07-25 23:51:48.000000000 +0200
+++ ispell-3.2.06/deformatters/Makefile 2007-08-18 15:25:47.000000000 +0200
@@ -76,7 +76,6 @@
@. ../config.sh; \
set -x; \
cd $$BINDIR; \
- strip $(PROGRAMS); \
chmod 755 $(PROGRAMS)
clean:

@ -1,156 +0,0 @@
/*
* $Id: local.h.gentoo,v 1.1 2002/03/15 05:37:36 tod Exp $
*/
/*
* Copyright 1992, 1993, 1999, 2001, Geoff Kuenning, Claremont, CA
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All modifications to the source code must be clearly marked as
* such. Binary redistributions based on modified source code
* must be clearly marked as modified versions in the documentation
* and/or other materials provided with the distribution.
* 4. Any web site or other electronic service that offers ispell for
* download or other electronic transfer as a separate entity, in
* either source or binary form, must also include a prominent statement
* indicating that information about ispell can be obtained from the
* following Web site URL:
* http://fmg-www.cs.ucla.edu/geoff/ispell.html
* If the offering service supports hyperlinks, the aforementioned
* Web site must also be offered as a hyperlink. Condition #4 does
* not apply if ispell is offered only as part of a larger, aggregated
* product such as a word processor or packaged operating system.
* 5. The name of Geoff Kuenning may not be used to endorse or promote
* products derived from this software without specific prior
* written permission.
*
* THIS SOFTWARE IS PROVIDED BY GEOFF KUENNING AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL GEOFF KUENNING OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
/*
* This file is a sample local.h file. It shows what I believe nearly every
* site will want to include in their local.h. You will probably want to
* expand this file; see "config.X" to learn of #defines that you might
* like to add to.
*/
/*
* $Log: local.h.gentoo,v $
* Revision 1.1 2002/03/15 05:37:36 tod
*
* New version. Hopefully this helps resolve the last of the *spell issues. Gnome-spell or bust :) Thanks to seemant for his help with the *spells.
*
* Revision 1.20 2001/07/25 21:51:47 geoff
* Minor license update.
*
* Revision 1.19 2001/07/23 20:24:04 geoff
* Update the copyright and the license.
*
* Revision 1.18 2001/05/30 21:14:47 geoff
* Invert the fcntl/mkstemp options so they will default to being used.
*
* Revision 1.17 2001/05/30 21:04:25 geoff
* Add HAS_FCNTL_H and HAS_MKSTEMP. Also give better comments on the USG
* option.
*
* Revision 1.16 1999/01/08 04:34:43 geoff
* Get rid of ELISPDIR and TEXINFODIR
*
* Revision 1.15 1999/01/07 01:57:57 geoff
* Update the copyright.
*
* Revision 1.14 1995/01/08 23:23:56 geoff
* Do some minor clarification of the instructional comments.
*
* Revision 1.13 1994/05/17 06:37:25 geoff
* Add one more item of warning advice to the comments.
*
* Revision 1.12 1994/02/07 06:00:00 geoff
* Add a warning about shell processing restrictions
*
* Revision 1.11 1994/01/25 07:11:50 geoff
* Get rid of all old RCS log lines in preparation for the 3.1 release.
*
*/
/*
* WARNING WARNING WARNING
*
* This file is *NOT* a normal C header file! Although it uses C
* syntax and is included in C programs, it is also processed by shell
* scripts that are very stupid about format.
*
* Do not try to use #if constructs to configure this file for more
* than one configuration. Do not place whitespace after the "#" in
* "#define". Do not attempt to disable lines by commenting them out.
* Do not use backslashes to reduce the length of long lines.
* None of these things will work the way you expect them to.
*
* WARNING WARNING WARNING
*/
#define MINIMENU /* Display a mini-menu at the bottom of the screen */
#undef NO8BIT /* Remove this if you use ISO character sets */
#define USG /* Define on System V or if term.c won't compile */
#undef NO_FCNTL_H /* Define if you get compile errors on fcntl.h */
#undef NO_MKSTEMP /* Define if you get compile or link errors */
#define HAS_RENAME
#define INSTALL "cp"
/*
* Important directory paths
*/
#define BINDIR "/usr/bin"
#define LIBDIR "/usr/lib/ispell"
#define TEXINFODIR "/usr/share/info"
#define WORDS "/usr/share/dict/words"
#define MAN1DIR "/usr/share/man/man1"
#define MAN4DIR "/usr/share/man/man5"
#define MAN4EXT ".5"
/*
* Place any locally-required #include statements here
*/
#define CC "gcc"
#define YACC "bison -y"
#define TERMLIB "-lncurses"
#define LANGUAGES "{american,MASTERDICTS=american.med,HASHFILES=americanmed.hash,EXTRADICT=} {british,MASTERDICTS=british.med,HASHFILES=britishmed.hash,EXTRADICT=}"
/*
* Settings
*/
#define MASKBITS 64
#define INPUTWORDLEN 128
#define MAXAFFIXLEN 32
#define MAXSTRINGCHARS 128
#define MASTERHASH "americanmed.hash"
#define HAS_RENAME
#define DEFNOBACKUPFLAG 0
#define BAKEXT "~"
#define DEFTEXFLAG 1
#define EGREPCMD "/usr/bin/grep -E"
#define LOOK "/usr/bin/look -df"
#define MAKE_SORTTMP "-T ${TMPDIR-/tmp}"
#define SORTPERSONAL 2000
#define USESH
#define COMMANDFORSPACE

@ -1,62 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/ispell/ispell-3.2.06-r6.ebuild,v 1.19 2011/02/06 05:59:58 leio Exp $
inherit eutils
PATCH_VER="0.1"
DESCRIPTION="fast screen-oriented spelling checker"
HOMEPAGE="http://fmg-www.cs.ucla.edu/geoff/ispell.html"
SRC_URI="http://fmg-www.cs.ucla.edu/geoff/tars/${P}.tar.gz
mirror://gentoo/${PF}-gentoo-${PATCH_VER}.diff.bz2"
SLOT="0"
LICENSE="as-is"
KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86"
IUSE=""
DEPEND="sys-apps/miscfiles
>=sys-libs/ncurses-5.2"
src_unpack() {
unpack ${A}
cd "${S}"
epatch "${WORKDIR}/${PF}-gentoo-${PATCH_VER}.diff"
epatch "${FILESDIR}/${P}-patch.diff"
epatch "${FILESDIR}/${P}-stripping.diff"
}
src_compile() {
make config.sh || die
#Fix config.sh to install to ${D}
cp -p config.sh config.sh.orig
sed \
-e "s:^\(BINDIR='\)\(.*\):\1${D}\2:" \
-e "s:^\(LIBDIR='\)\(.*\):\1${D}\2:" \
-e "s:^\(MAN1DIR='\)\(.*\):\1${D}\2:" \
-e "s:^\(MAN4DIR='\)\(.*\):\1${D}\2:" \
< config.sh > config.sh.install
make || die
}
src_install() {
cp -p config.sh.install config.sh
#Need to create the directories to install into
#before 'make install'. Build environment **doesn't**
#check for existence and create if not already there.
dodir /usr/bin /usr/lib/ispell /usr/share/info \
/usr/share/man/man1 /usr/share/man/man5
make \
install || die "Installation Failed"
rmdir ${D}/usr/share/man/man5
rmdir ${D}/usr/share/info
dodoc Contributors README WISHES || die "installing docs failed"
dosed ${D}/usr/share/man/man1/ispell.1
}

@ -1,12 +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/app-text/ispell/ispell-3.3.02-r1.ebuild,v 1.10 2011/06/12 12:16:05 maekke Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/ispell/ispell-3.3.02-r1.ebuild,v 1.11 2012/04/17 14:46:45 scarabeus Exp $
EAPI="3"
EAPI=4
inherit eutils multilib toolchain-funcs
PATCH_VER="0.3"
DESCRIPTION="fast screen-oriented spelling checker"
HOMEPAGE="http://fmg-www.cs.ucla.edu/geoff/ispell.html"
SRC_URI="http://fmg-www.cs.ucla.edu/geoff/tars/${P}.tar.gz
@ -17,13 +18,16 @@ SLOT="0"
KEYWORDS="alpha amd64 ~arm hppa ~mips ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
RDEPEND="sys-apps/miscfiles
>=sys-libs/ncurses-5.2"
RDEPEND="
sys-apps/miscfiles
>=sys-libs/ncurses-5.2
"
DEPEND="${RDEPEND}"
src_prepare() {
epatch "${WORKDIR}"/${P}-gentoo-${PATCH_VER}.diff
epatch "${FILESDIR}"/${P}-glibc-2.10.patch
epatch \
"${WORKDIR}"/${P}-gentoo-${PATCH_VER}.diff \
"${FILESDIR}"/${P}-glibc-2.10.patch
sed -e "s:GENTOO_LIBDIR:$(get_libdir):" -i local.h || die
sed -e "s:\(^#define CC\).*:\1 \"$(tc-getCC)\":" -i local.h || die
@ -32,7 +36,7 @@ src_prepare() {
src_configure() {
# Prepare config.sh for installation phase to avoid twice rebuild
emake -j1 config.sh || die "configuration failed"
emake -j1 config.sh
sed \
-e "s:^\(BINDIR='\)\(.*\):\1${ED}\2:" \
-e "s:^\(LIBDIR='\)\(.*\):\1${ED}\2:" \
@ -42,13 +46,13 @@ src_configure() {
}
src_compile() {
emake -j1 || die "compilation failed"
emake -j1
}
src_install() {
mv config.sh.install config.sh
emake -j1 install || die "Installation Failed"
dodoc CHANGES Contributors README WISHES || die "installing docs failed"
emake -j1 install
dodoc CHANGES Contributors README WISHES
}
pkg_postinst() {

@ -1,66 +0,0 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/ispell/ispell-3.3.02.ebuild,v 1.2 2007/11/22 19:25:48 philantrop Exp $
inherit eutils multilib
PATCH_VER="0.2"
DESCRIPTION="fast screen-oriented spelling checker"
HOMEPAGE="http://fmg-www.cs.ucla.edu/geoff/ispell.html"
SRC_URI="http://fmg-www.cs.ucla.edu/geoff/tars/${P}.tar.gz
mirror://gentoo/${P}-gentoo-${PATCH_VER}.diff.bz2"
SLOT="0"
LICENSE="as-is"
KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
IUSE=""
DEPEND="sys-apps/miscfiles
>=sys-libs/ncurses-5.2"
src_unpack() {
unpack ${A}
cd "${S}"
epatch "${WORKDIR}/${P}-gentoo-${PATCH_VER}.diff"
sed -i -e "s:GENTOO_LIBDIR:$(get_libdir):" local.h.gentoo || die "setting libdir failed"
cp local.h.gentoo local.h
}
src_compile() {
emake -j1 config.sh || die "configuration failed"
# Fix config.sh to install to ${D}
cp -p config.sh config.sh.orig
sed \
-e "s:^\(BINDIR='\)\(.*\):\1${D}\2:" \
-e "s:^\(LIBDIR='\)\(.*\):\1${D}\2:" \
-e "s:^\(MAN1DIR='\)\(.*\):\1${D}\2:" \
-e "s:^\(MAN45DIR='\)\(.*\):\1${D}\2:" \
< config.sh > config.sh.install
emake -j1 || die "compilation failed"
}
src_install() {
cp -p config.sh.install config.sh
# Need to create the directories to install into
# before 'make install'. Build environment **doesn't**
# check for existence and create if not already there.
dodir /usr/bin /usr/$(get_libdir)/ispell /usr/share/info \
/usr/share/man/man1 /usr/share/man/man5
emake -j1 install || die "Installation Failed"
rmdir "${D}"/usr/share/info || die "removing empty info dir failed"
dodoc CHANGES Contributors README WISHES || die "installing docs failed"
dosed "${D}"/usr/share/man/man1/ispell.1 || die "dosed failed"
}
pkg_postinst() {
echo
ewarn "If you just updated from an older version of ${PN} you *have* to re-emerge"
ewarn "all your dictionaries to avoid segmentation faults and other problems."
echo
}

@ -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-vim/gentoo-syntax/gentoo-syntax-20120109.ebuild,v 1.6 2012/04/16 19:22:50 ranger Exp $
# $Header: /var/cvsroot/gentoo-x86/app-vim/gentoo-syntax/gentoo-syntax-20120109.ebuild,v 1.7 2012/04/17 21:58:37 ranger Exp $
EAPI=4
@ -11,7 +11,7 @@ HOMEPAGE="http://www.gentoo.org/"
SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="vim"
KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="ignore-glep31"
VIM_PLUGIN_HELPFILES="gentoo-syntax"

@ -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-vim/minibufexpl/minibufexpl-6.4.3.ebuild,v 1.4 2012/04/05 06:19:28 jdhore Exp $
# $Header: /var/cvsroot/gentoo-x86/app-vim/minibufexpl/minibufexpl-6.4.3.ebuild,v 1.5 2012/04/17 16:04:29 ranger Exp $
EAPI=4
@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/fholgado/minibufexpl.vim"
SRC_URI="https://github.com/fholgado/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"
LICENSE="as-is"
KEYWORDS="amd64 ~mips ~ppc x86"
KEYWORDS="amd64 ~mips ppc x86"
IUSE=""
VIM_PLUGIN_HELPFILES="${PN}.txt"

@ -1 +1,2 @@
DIST gstreamermm-0.10.10.1.tar.xz 6269376 RMD160 d6c22355b7931b775e4974f067b963cdcfd26e7e SHA1 50cd1cdae069db7e6a5b2ff32ae98b70f3ba16c1 SHA256 4ba05200b699973af75d5fb397f2e4270f924cdd8c394f7954f5c11ea5083c9c
DIST gstreamermm-0.10.9.1.tar.bz2 8045200 RMD160 c41a8069e46612a183159347e6a4b21f1874da8a SHA1 e7ccf17a354789b228614d0e49e98a1f3230a276 SHA256 85a07d4d0d67ad527c1fd9bf47c130032db89e9b26f412969a8c8ad6fdebf516

@ -0,0 +1,35 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gstreamermm/gstreamermm-0.10.10.1.ebuild,v 1.1 2012/04/17 10:39:20 pacho Exp $
EAPI=4
GNOME2_LA_PUNT="yes"
inherit gnome2
DESCRIPTION="C++ interface for GStreamer"
HOMEPAGE="http://gstreamer.freedesktop.org/bindings/cplusplus.html"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="test"
RDEPEND="
>=media-libs/gstreamer-0.10.35:0.10
>=media-libs/gst-plugins-base-0.10.35:0.10
>=dev-cpp/glibmm-2.28.0:2
>=dev-cpp/libxmlpp-2.14:2.6
>=dev-libs/libsigc++-2:2
"
DEPEND="${RDEPEND}
dev-util/pkgconfig
test? (
media-libs/gst-plugins-good:0.10
media-plugins/gst-plugins-vorbis:0.10
media-plugins/gst-plugins-x:0.10 )
"
DOCS="AUTHORS ChangeLog NEWS README"
# Installs reference docs into /usr/share/doc/gstreamermm-0.10/
# but that's okay, because the rest of dev-cpp/*mm stuff does the same

@ -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-db/m17n-db/m17n-db-1.6.3.ebuild,v 1.7 2012/04/16 19:24:34 ranger Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-db/m17n-db/m17n-db-1.6.3.ebuild,v 1.8 2012/04/17 21:39:35 ranger Exp $
EAPI=4
@ -12,7 +12,7 @@ SRC_URI="http://www.m17n.org/m17n-lib-download/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~sh ~sparc x86"
KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sh ~sparc x86"
IUSE=""
DEPEND="sys-devel/gettext"

@ -1,8 +1,13 @@
DIST mariadb-5.1.42.tar.gz 21616693 RMD160 13e1d578aa135aaefadd9bd2eb00f7e0c7e236a3 SHA1 c6082203eea91a4efb95a11d06fccc4215a465a4 SHA256 f93dbf85ad03fe1928738e5552b8a7f911a0c3f2d644784a355a8f1b8fc2c29b
DIST mariadb-5.1.50.tar.gz 24567591 RMD160 d143e06ea847aab33922749d1e29548354df8f87 SHA1 0f314a6f396192b364d81feb7732ea2544153ffb SHA256 7d2a42374d05de28180985e8f4de98c2133ea1c7e39d8ccb9c12a4323704a5e7
DIST mariadb-5.1.55.tar.gz 24613002 RMD160 e3d46d15b472616f07bd22a9a72107029af1f05b SHA1 789452c8a63c58692fcc4f16f45dc1b3e5d6cfe2 SHA256 df031b2f7dcc92a36da3a76b346034c286e5cb77d8f634e3030543b54f8c052b
DIST mariadb-5.1.62.tar.gz 24931609 RMD160 873961f72de719fed085085c8cb8560c7cef5e06 SHA1 b08c7d5b229eee5f646f839d924223dac9b82a38 SHA256 2293e973d22bc969dcb8b17710c909182d2b7960f711b124c0c9f429f9dd11da
DIST mariadb-5.2.12.tar.gz 25364319 RMD160 30efbcf2fe50b9b11c6cae128b1b405f4e265f76 SHA1 b96d4ad9f41b5203fadc788eca26a49a1df59000 SHA256 6d53bc0831d87b695cc872c3456c16935aed67250fb305cdb7197274e2632a49
DIST mariadb-5.2.9.tar.gz 25107185 RMD160 23f89e13ec9b9f731f42ba65f40ea07ad21a4471 SHA1 da87cdc4d3f76cbbe059684175461e18972f323b SHA256 6ef38be1d6f1fe7b1b99b9d6ddf5ac46cd7d0c05cb2a5088a7ec294e62fbd611
DIST mariadb-5.3.6.tar.gz 26724631 RMD160 5fdad331d9bff10282f55b54cb701d14b0544d4a SHA1 deb1dfd9e84587f99c5df3114d53ba09ba2ed298 SHA256 899410ef19981d9be3c293f57fbceffc88487ccbd6ebcb02a8c14831c918e040
DIST mariadb-5.5.23.tar.gz 27432223 RMD160 d09e1cf072aa3b1c08df05fddbc19f7a699452d3 SHA1 a4dc62758d562feab29904c9329a8497786e5c30 SHA256 e4ce1f31739d97f43768cf3c1efaf05d291d9758e6097fd2512fafa5686a2797
DIST mysql-extras-20100324-0235Z.tar.bz2 1054397 RMD160 7c0800f08ca96cd6dbdd812cb7a922d96077361c SHA1 bf77a1e759bfc1bff1ba0914a5701543de4d953f SHA256 6345de31176cbc69b13e92a4d459432c54a82fcd5f54350c4280287da9b3b0c1
DIST mysql-extras-20101006-0004Z.tar.bz2 1251792 RMD160 ee333704688e4e9f07f5e7fb68961d3ffaff0755 SHA1 c1633295abb7f3d2ff463938f85e1bc8ed708b4f SHA256 a42c4988a25113bef5cc727fb24c994502f4d02469246ff839f8ea2a08c07bb7
DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8
DIST mysql-extras-20110819-0415Z.tar.bz2 1734262 RMD160 88ba7cd1ccc35b2fb526257e46f4169afc9fafaa SHA1 996c4e9a22c454b255856228c30bb3a9ea56a443 SHA256 f2749639669d458ae59c6eb3134f5c2689219281ee4f4d33fdc525a19d456a5f
DIST mysql-extras-20120416-2021Z.tar.bz2 1874771 RMD160 d09f3b16c2123b50d96b75c6cdd878dd16a06518 SHA1 f197fbea8a76de959cc4c61ab47e61ad648cd56a SHA256 af780a9c41a5073d7a66e991e9b1c468bea89b1efd7fbea7e6daa5f75d235e33

@ -0,0 +1,171 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.1.62.ebuild,v 1.1 2012/04/18 02:14:09 robbat2 Exp $
MY_EXTRAS_VER="20120416-2021Z"
EAPI="4"
# Build system
BUILD="autotools"
inherit toolchain-funcs mysql-v2
# only to make repoman happy. it is really set in the eclass
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
# When MY_EXTRAS is bumped, the index should be revised to exclude these.
EPATCH_EXCLUDE=''
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
RDEPEND="${RDEPEND}"
# Please do not add a naive src_unpack to this ebuild
# If you want to add a single patch, copy the ebuild to an overlay
# and create your own mysql-extras tarball, looking at 000_index.txt
src_prepare() {
sed -i \
-e '/^noinst_PROGRAMS/s/basic-t//g' \
"${S}"/unittest/mytap/t/Makefile.am
mysql-v2_src_prepare
}
# Official test instructions:
# USE='berkdb -cluster embedded extraengine perl ssl community' \
# FEATURES='test userpriv -usersandbox' \
# ebuild mariadb-X.X.XX.ebuild \
# digest clean package
src_test() {
# Bug #213475 - MySQL _will_ object strenously if your machine is named
# localhost. Also causes weird failures.
[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
emake check || die "make check failed"
if ! use "minimal" ; then
if [[ $UID -eq 0 ]]; then
die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
fi
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
cd "${S}"
einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
local retstatus_unit
local retstatus_ns
local retstatus_ps
local t
addpredict /this-dir-does-not-exist/t9.MYI
# Ensure that parallel runs don't die
export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
# The entire 5.0 series has pre-generated SSL certificates, they have
# mostly expired now. ${S}/mysql-tests/std-data/*.pem
# The certs really SHOULD be generated for the tests, so that they are
# not expiring like this. We cannot do so ourselves as the tests look
# closely as the cert path data, and we do not have the CA key to regen
# ourselves. Alternatively, upstream should generate them with at least
# 50-year validity.
#
# Known expiry points:
# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
#
# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
# expired/invalid.
case ${PV} in
5.1.*|5.4.*|5.5.*)
for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
mysql-v2_disable_test \
"$t" \
"These OpenSSL tests break due to expired certificates"
done
;;
esac
# These are also failing in MySQL 5.1 for now, and are believed to be
# false positives:
#
# main.mysql_comment, main.mysql_upgrade, main.information_schema,
# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
# fails due to USE=-latin1 / utf8 default
#
# main.mysql_client_test:
# segfaults at random under Portage only, suspect resource limits.
#
# main.not_partition:
# Failure reason unknown at this time, must resolve before package.mask
# removal FIXME
case ${PV} in
5.1.*|5.2.*|5.4.*|5.5.*)
for t in main.mysql_client_test main.mysql_comments \
main.mysql_upgrade \
main.information_schema \
main.not_partition funcs_1.is_columns_mysql \
funcs_1.is_tables_mysql funcs_1.is_triggers; do
mysql-v2_disable_test "$t" "False positives in Gentoo"
done
;;
esac
# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
# These tests are picking up a 'connect-timeout' config from somewhere,
# which is not valid, and since it does not have 'loose-' in front of
# it, it's causing a failure
case ${PV} in
5.1.5*|5.4.*|5.5.*|6*)
for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
mysql-v2_disable_test "$t" \
"False positives in Gentoo: connect-timeout"
done
;;
esac
use profiling && use community \
|| mysql-v2_disable_test main.profiling \
"Profiling test needs profiling support"
if [ "${PN}" == "mariadb" ]; then
for t in \
parts.part_supported_sql_func_ndb \
parts.partition_auto_increment_ndb ; do
mysql-v2_disable_test $t "ndb not supported in mariadb"
done
fi
# create directories because mysqladmin might make out of order
mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
# We run the test protocols seperately
emake test-unit
retstatus_unit=$?
[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
retstatus_ns=$?
[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
retstatus_ps=$?
[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
# TODO:
# When upstream enables the pr and nr testsuites, we need those as well.
# Cleanup is important for these testcases.
pkill -9 -f "${S}/ndb" 2>/dev/null
pkill -9 -f "${S}/sql" 2>/dev/null
failures=""
[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
[[ -z "$failures" ]] || die "Test failures: $failures"
einfo "Tests successfully completed"
else
einfo "Skipping server tests due to minimal build."
fi
}

@ -0,0 +1,171 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.2.12.ebuild,v 1.1 2012/04/18 02:14:09 robbat2 Exp $
MY_EXTRAS_VER="20120416-2021Z"
EAPI="4"
# Build system
BUILD="autotools"
inherit toolchain-funcs mysql-v2
# only to make repoman happy. it is really set in the eclass
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
KEYWORDS="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
# When MY_EXTRAS is bumped, the index should be revised to exclude these.
EPATCH_EXCLUDE=''
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
RDEPEND="${RDEPEND}"
# Please do not add a naive src_unpack to this ebuild
# If you want to add a single patch, copy the ebuild to an overlay
# and create your own mysql-extras tarball, looking at 000_index.txt
src_prepare() {
sed -i \
-e '/^noinst_PROGRAMS/s/basic-t//g' \
"${S}"/unittest/mytap/t/Makefile.am
mysql-v2_src_prepare
}
# Official test instructions:
# USE='berkdb -cluster embedded extraengine perl ssl community' \
# FEATURES='test userpriv -usersandbox' \
# ebuild mariadb-X.X.XX.ebuild \
# digest clean package
src_test() {
# Bug #213475 - MySQL _will_ object strenously if your machine is named
# localhost. Also causes weird failures.
[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
emake check || die "make check failed"
if ! use "minimal" ; then
if [[ $UID -eq 0 ]]; then
die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
fi
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
cd "${S}"
einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
local retstatus_unit
local retstatus_ns
local retstatus_ps
local t
addpredict /this-dir-does-not-exist/t9.MYI
# Ensure that parallel runs don't die
export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
# The entire 5.0 series has pre-generated SSL certificates, they have
# mostly expired now. ${S}/mysql-tests/std-data/*.pem
# The certs really SHOULD be generated for the tests, so that they are
# not expiring like this. We cannot do so ourselves as the tests look
# closely as the cert path data, and we do not have the CA key to regen
# ourselves. Alternatively, upstream should generate them with at least
# 50-year validity.
#
# Known expiry points:
# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
#
# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
# expired/invalid.
case ${PV} in
5.1.*|5.4.*|5.5.*)
for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
mysql-v2_disable_test \
"$t" \
"These OpenSSL tests break due to expired certificates"
done
;;
esac
# These are also failing in MySQL 5.1 for now, and are believed to be
# false positives:
#
# main.mysql_comment, main.mysql_upgrade, main.information_schema,
# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
# fails due to USE=-latin1 / utf8 default
#
# main.mysql_client_test:
# segfaults at random under Portage only, suspect resource limits.
#
# main.not_partition:
# Failure reason unknown at this time, must resolve before package.mask
# removal FIXME
case ${PV} in
5.1.*|5.2.*|5.4.*|5.5.*)
for t in main.mysql_client_test main.mysql_comments \
main.mysql_upgrade \
main.information_schema \
main.not_partition funcs_1.is_columns_mysql \
funcs_1.is_tables_mysql funcs_1.is_triggers; do
mysql-v2_disable_test "$t" "False positives in Gentoo"
done
;;
esac
# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
# These tests are picking up a 'connect-timeout' config from somewhere,
# which is not valid, and since it does not have 'loose-' in front of
# it, it's causing a failure
case ${PV} in
5.1.5*|5.4.*|5.5.*|6*)
for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
mysql-v2_disable_test "$t" \
"False positives in Gentoo: connect-timeout"
done
;;
esac
use profiling && use community \
|| mysql-v2_disable_test main.profiling \
"Profiling test needs profiling support"
if [ "${PN}" == "mariadb" ]; then
for t in \
parts.part_supported_sql_func_ndb \
parts.partition_auto_increment_ndb ; do
mysql-v2_disable_test $t "ndb not supported in mariadb"
done
fi
# create directories because mysqladmin might make out of order
mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
# We run the test protocols seperately
emake test-unit
retstatus_unit=$?
[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
retstatus_ns=$?
[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
retstatus_ps=$?
[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
# TODO:
# When upstream enables the pr and nr testsuites, we need those as well.
# Cleanup is important for these testcases.
pkill -9 -f "${S}/ndb" 2>/dev/null
pkill -9 -f "${S}/sql" 2>/dev/null
failures=""
[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
[[ -z "$failures" ]] || die "Test failures: $failures"
einfo "Tests successfully completed"
else
einfo "Skipping server tests due to minimal build."
fi
}

@ -0,0 +1,174 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.3.6.ebuild,v 1.1 2012/04/18 02:14:09 robbat2 Exp $
MY_EXTRAS_VER="20120416-2021Z"
EAPI="4"
# Build system
BUILD="autotools"
# Suffix on files...
#MY_PV="$PV-ga"
inherit toolchain-funcs mysql-v2
# only to make repoman happy. it is really set in the eclass
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
KEYWORDS="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
# When MY_EXTRAS is bumped, the index should be revised to exclude these.
EPATCH_EXCLUDE=''
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
RDEPEND="${RDEPEND}"
# Please do not add a naive src_unpack to this ebuild
# If you want to add a single patch, copy the ebuild to an overlay
# and create your own mysql-extras tarball, looking at 000_index.txt
src_prepare() {
sed -i \
-e '/^noinst_PROGRAMS/s/basic-t//g' \
"${S}"/unittest/mytap/t/Makefile.am
mysql-v2_src_prepare
}
# Official test instructions:
# USE='berkdb -cluster embedded extraengine perl ssl community' \
# FEATURES='test userpriv -usersandbox' \
# ebuild mariadb-X.X.XX.ebuild \
# digest clean package
src_test() {
# Bug #213475 - MySQL _will_ object strenously if your machine is named
# localhost. Also causes weird failures.
[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
emake check || die "make check failed"
if ! use "minimal" ; then
if [[ $UID -eq 0 ]]; then
die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
fi
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
cd "${S}"
einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
local retstatus_unit
local retstatus_ns
local retstatus_ps
local t
addpredict /this-dir-does-not-exist/t9.MYI
# Ensure that parallel runs don't die
export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
# The entire 5.0 series has pre-generated SSL certificates, they have
# mostly expired now. ${S}/mysql-tests/std-data/*.pem
# The certs really SHOULD be generated for the tests, so that they are
# not expiring like this. We cannot do so ourselves as the tests look
# closely as the cert path data, and we do not have the CA key to regen
# ourselves. Alternatively, upstream should generate them with at least
# 50-year validity.
#
# Known expiry points:
# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
#
# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
# expired/invalid.
case ${PV} in
5.1.*|5.5.*)
for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
mysql-v2_disable_test \
"$t" \
"These OpenSSL tests break due to expired certificates"
done
;;
esac
# These are also failing in MySQL 5.1 for now, and are believed to be
# false positives:
#
# main.mysql_comment, main.mysql_upgrade, main.information_schema,
# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
# fails due to USE=-latin1 / utf8 default
#
# main.mysql_client_test:
# segfaults at random under Portage only, suspect resource limits.
#
# main.not_partition:
# Failure reason unknown at this time, must resolve before package.mask
# removal FIXME
case ${PV} in
5.1.*|5.2.*|5.3.*|5.5.*)
for t in main.mysql_client_test main.mysql_comments \
main.mysql_upgrade \
main.information_schema \
main.not_partition funcs_1.is_columns_mysql \
funcs_1.is_tables_mysql funcs_1.is_triggers; do
mysql-v2_disable_test "$t" "False positives in Gentoo"
done
;;
esac
# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
# These tests are picking up a 'connect-timeout' config from somewhere,
# which is not valid, and since it does not have 'loose-' in front of
# it, it's causing a failure
case ${PV} in
5.1.5*|5.5.*|6*)
for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
mysql-v2_disable_test "$t" \
"False positives in Gentoo: connect-timeout"
done
;;
esac
use profiling && use community \
|| mysql-v2_disable_test main.profiling \
"Profiling test needs profiling support"
if [ "${PN}" == "mariadb" ]; then
for t in \
parts.part_supported_sql_func_ndb \
parts.partition_auto_increment_ndb ; do
mysql-v2_disable_test $t "ndb not supported in mariadb"
done
fi
# create directories because mysqladmin might make out of order
mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
# We run the test protocols seperately
emake test-unit
retstatus_unit=$?
[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
retstatus_ns=$?
[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
retstatus_ps=$?
[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
# TODO:
# When upstream enables the pr and nr testsuites, we need those as well.
# Cleanup is important for these testcases.
pkill -9 -f "${S}/ndb" 2>/dev/null
pkill -9 -f "${S}/sql" 2>/dev/null
failures=""
[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
[[ -z "$failures" ]] || die "Test failures: $failures"
einfo "Tests successfully completed"
else
einfo "Skipping server tests due to minimal build."
fi
}

@ -0,0 +1,171 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.23.ebuild,v 1.1 2012/04/18 02:14:09 robbat2 Exp $
MY_EXTRAS_VER="20120416-2021Z"
EAPI="4"
# Build system
BUILD="cmake"
inherit toolchain-funcs mysql-v2
# only to make repoman happy. it is really set in the eclass
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
KEYWORDS="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
# When MY_EXTRAS is bumped, the index should be revised to exclude these.
EPATCH_EXCLUDE=''
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
RDEPEND="${RDEPEND}"
# Please do not add a naive src_unpack to this ebuild
# If you want to add a single patch, copy the ebuild to an overlay
# and create your own mysql-extras tarball, looking at 000_index.txt
src_prepare() {
sed -i \
-e '/^noinst_PROGRAMS/s/basic-t//g' \
"${S}"/unittest/mytap/t/Makefile.am
mysql-v2_src_prepare
}
# Official test instructions:
# USE='berkdb -cluster embedded extraengine perl ssl community' \
# FEATURES='test userpriv -usersandbox' \
# ebuild mariadb-X.X.XX.ebuild \
# digest clean package
src_test() {
# Bug #213475 - MySQL _will_ object strenously if your machine is named
# localhost. Also causes weird failures.
[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
emake check || die "make check failed"
if ! use "minimal" ; then
if [[ $UID -eq 0 ]]; then
die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
fi
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
cd "${S}"
einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
local retstatus_unit
local retstatus_ns
local retstatus_ps
local t
addpredict /this-dir-does-not-exist/t9.MYI
# Ensure that parallel runs don't die
export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
# The entire 5.0 series has pre-generated SSL certificates, they have
# mostly expired now. ${S}/mysql-tests/std-data/*.pem
# The certs really SHOULD be generated for the tests, so that they are
# not expiring like this. We cannot do so ourselves as the tests look
# closely as the cert path data, and we do not have the CA key to regen
# ourselves. Alternatively, upstream should generate them with at least
# 50-year validity.
#
# Known expiry points:
# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
#
# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
# expired/invalid.
case ${PV} in
5.1.*|5.5.*)
for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
mysql-v2_disable_test \
"$t" \
"These OpenSSL tests break due to expired certificates"
done
;;
esac
# These are also failing in MySQL 5.1 for now, and are believed to be
# false positives:
#
# main.mysql_comment, main.mysql_upgrade, main.information_schema,
# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
# fails due to USE=-latin1 / utf8 default
#
# main.mysql_client_test:
# segfaults at random under Portage only, suspect resource limits.
#
# main.not_partition:
# Failure reason unknown at this time, must resolve before package.mask
# removal FIXME
case ${PV} in
5.1.*|5.2.*|5.3.*|5.5.*)
for t in main.mysql_client_test main.mysql_comments \
main.mysql_upgrade \
main.information_schema \
main.not_partition funcs_1.is_columns_mysql \
funcs_1.is_tables_mysql funcs_1.is_triggers; do
mysql-v2_disable_test "$t" "False positives in Gentoo"
done
;;
esac
# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
# These tests are picking up a 'connect-timeout' config from somewhere,
# which is not valid, and since it does not have 'loose-' in front of
# it, it's causing a failure
case ${PV} in
5.1.5*|5.5.*|6*)
for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
mysql-v2_disable_test "$t" \
"False positives in Gentoo: connect-timeout"
done
;;
esac
use profiling && use community \
|| mysql-v2_disable_test main.profiling \
"Profiling test needs profiling support"
if [ "${PN}" == "mariadb" ]; then
for t in \
parts.part_supported_sql_func_ndb \
parts.partition_auto_increment_ndb ; do
mysql-v2_disable_test $t "ndb not supported in mariadb"
done
fi
# create directories because mysqladmin might make out of order
mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
# We run the test protocols seperately
emake test-unit
retstatus_unit=$?
[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
retstatus_ns=$?
[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
retstatus_ps=$?
[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
# TODO:
# When upstream enables the pr and nr testsuites, we need those as well.
# Cleanup is important for these testcases.
pkill -9 -f "${S}/ndb" 2>/dev/null
pkill -9 -f "${S}/sql" 2>/dev/null
failures=""
[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
[[ -z "$failures" ]] || die "Test failures: $failures"
einfo "Tests successfully completed"
else
einfo "Skipping server tests due to minimal build."
fi
}

@ -2,6 +2,11 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>mysql</herd>
<!--
Please note that this list is shared between the following packages:
dev-db/mysql
dev-db/mariadb
-->
<use>
<flag name='big-tables'>Make tables contain up to 1.844E+19 rows</flag>
<flag name='cluster'>Add support for NDB clustering (deprecated)</flag>
@ -15,6 +20,7 @@
<flag name='oqgraph'>Add support for the Open Query GRAPH engine</flag>
<flag name='pbxt'>Add experimental support for PBXT storage engine</flag>
<flag name='profiling'>Add support for statement profiling (requires USE=community).</flag>
<flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
<flag name='sphinx'>Add suport for the sphinx full-text search engine</flag>
<flag name='test'>Install upstream testsuites for end use.</flag>
</use>

@ -0,0 +1,103 @@
Allow compilation with glib 2.32.
Patch by goeland86@gmail.com in bug 412157
--- library/canvas/src/mdc_canvas_view.h 2012-02-21 17:53:45.000000000 +0100
+++ library/canvas/src/mdc_canvas_view_new.h 2012-04-15 21:34:19.000000000 +0200
@@ -28,7 +28,7 @@
#include "mdc_selection.h"
#ifndef _WIN32
-#include <glib/gthread.h>
+#include <glib.h>
#endif
BEGIN_MDC_DECLS
--- library/canvas/src/stdafx.h 2012-02-21 17:53:46.000000000 +0100
+++ library/canvas/src/stdafx.new.h 2012-04-15 22:18:14.000000000 +0200
@@ -52,7 +52,7 @@
#include <gl/gl.h>
#include <gl/glu.h>
-#include <glib/gthread.h>
+#include <glib.h>
#endif // _WIN32
--- library/canvas/src/mdc_canvas_view_printing.cpp 2012-04-15 22:17:38.000000000 +0200
+++ library/canvas/src/mdc_canvas_view_printing.new.cpp 2012-04-15 22:14:49.000000000 +0200
@@ -21,7 +21,7 @@
#include "mdc_canvas_view.h"
#include "mdc_canvas_view_printing.h"
-#include <glib/gmessages.h>
+#include <glib.h>
#ifdef _WIN32
#include <cairo/cairo-win32.h>
--- library/grt/src/grtpp_util.new.cpp 2012-04-15 22:57:55.000000000 +0200
+++ library/grt/src/grtpp_util.cpp 2012-02-21 17:53:44.000000000 +0100
@@ -25,7 +25,7 @@
#include "grtpp_util.h"
#include "base/string_utilities.h"
-#include <glib/gbase64.h>
+#include <glib.h>
#include <functional>
using namespace grt;
--- backend/wbprivate/sqlide/wb_live_schema_tree.h 2012-02-21 17:53:39.000000000 +0100
+++ backend/wbprivate/sqlide/wb_live_schema_tree.new.h 2012-04-15 23:41:01.000000000 +0200
@@ -24,7 +24,7 @@
#include "grtpp.h"
#include "workbench/wb_backend_public_interface.h"
#include "base/string_utilities.h"
-#include <glib/gpattern.h>
+#include <glib.h>
namespace wb
{
--- modules/db.mysql.sqlparser/src/mysql_sql_parser_fe.cpp 2012-02-21 17:53:37.000000000 +0100
+++ modules/db.mysql.sqlparser/src/mysql_sql_parser_fe.new.cpp 2012-04-16 00:33:55.000000000 +0200
@@ -20,7 +20,7 @@
#include "stdafx.h"
-#include <glib/gunicode.h>
+#include <glib.h>
#include "grt/common.h"
#include "grt/grt_manager.h"
#include "grtdb/charset_utils.h"
@@ -651,4 +651,4 @@
return versioning_comment_subst_token;
else
return token;
-}
\ No newline at end of file
+}
--- modules/db.mysql.sqlparser/src/stdafx.h 2012-02-21 17:53:46.000000000 +0100
+++ modules/db.mysql.sqlparser/src/stdafx.new.h 2012-04-16 00:35:10.000000000 +0200
@@ -32,7 +32,7 @@
#include <algorithm>
#include <sstream>
#include <fstream>
-#include <glib/gunicode.h>
+#include <glib.h>
#include <map>
#include "direct.h"
--- plugins/db.mysql/backend/db_plugin_be.cpp 2012-02-21 17:53:41.000000000 +0100
+++ plugins/db.mysql/backend/db_plugin_be.new.cpp 2012-04-16 01:39:48.000000000 +0200
@@ -31,7 +31,7 @@
#include "grts/structs.db.h"
#include "base/string_utilities.h"
-#include <glib/gunicode.h>
+#include <glib.h>
void Db_plugin::grtm(bec::GRTManager *grtm)
{

@ -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-db/mysql-workbench/mysql-workbench-5.2.39.ebuild,v 1.1 2012/04/16 18:50:31 graaff Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-5.2.39.ebuild,v 1.2 2012/04/17 18:19:20 graaff Exp $
EAPI="3"
GCONF_DEBUG="no"
@ -73,6 +73,8 @@ src_prepare() {
# 357539.
rm -rf ext/ctemplate || die
mkdir -p ext/ctemplate/ctemplate-src || die
epatch "${FILESDIR}/${P}-glib-2.32.patch"
}
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/dev-db/pgadmin3/pgadmin3-1.14.2.ebuild,v 1.3 2012/04/05 20:39:30 phajdan.jr Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.14.2.ebuild,v 1.4 2012/04/16 21:37:54 ranger Exp $
EAPI="4"
@ -13,7 +13,7 @@ HOMEPAGE="http://www.pgadmin.org/"
SRC_URI="mirror://postgresql/${PN}/release/v${PV}/src/${P}.tar.gz"
LICENSE="POSTGRESQL"
KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
KEYWORDS="amd64 ppc x86 ~x86-fbsd"
SLOT="0"
IUSE="debug"

@ -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-db/qdbm/qdbm-1.8.78-r1.ebuild,v 1.5 2012/04/05 06:14:05 jdhore Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.78-r1.ebuild,v 1.7 2012/04/17 21:48:38 ranger Exp $
EAPI="4"
@ -12,7 +12,7 @@ SRC_URI="http://fallabs.com/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
IUSE="cxx debug java perl ruby zlib"
RDEPEND="java? ( >=virtual/jre-1.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-db/slony1/slony1-2.1.1.ebuild,v 1.3 2012/04/05 21:22:03 phajdan.jr Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-db/slony1/slony1-2.1.1.ebuild,v 1.4 2012/04/16 21:37:00 ranger Exp $
EAPI="4"
@ -18,7 +18,7 @@ SRC_URI="http://main.slony.info/downloads/${MAJ_PV}/source/${P}.tar.bz2
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 ~ppc x86"
KEYWORDS="amd64 ppc x86"
DEPEND="|| (
dev-db/postgresql-server:9.1

@ -1 +0,0 @@
DIST gluezilla-2.6.tar.bz2 286772 RMD160 8c35f646c6c4bf122b4c0bd7fdffb98f93338915 SHA1 060518a41535a4a5ae59a070a52b49dea6f69305 SHA256 c557a21695cea376cb062adcc50d336a15e0549ce0f3a157702d6b32805d9b4b

@ -1,200 +0,0 @@
diff -ur gluezilla-2.6.orig/configure.ac gluezilla-2.6/configure.ac
--- gluezilla-2.6.orig/configure.ac 2011-03-27 18:51:37.000000000 +0200
+++ gluezilla-2.6/configure.ac 2011-03-27 18:52:45.000000000 +0200
@@ -87,16 +87,23 @@
if test "x${oldxul}" != xyes ; then
- AC_MSG_CHECKING(Mozilla XPCOM > 1.8)
- mozilla_xpcom_pcs="libxul-embedding-unstable"
- for pc in $mozilla_xpcom_pcs; do
- if $PKG_CONFIG --exists $pc; then
- AC_MSG_RESULT($pc)
- mozilla_xpcom=$pc
- XUL_VERSION=3
- break;
- fi
- done
+ if test -z $mozilla_xpcom; then
+ AC_MSG_CHECKING(Mozilla XPCOM > 1.8)
+ mozilla_xpcom_pcs="libxul-embedding libxul-embedding-unstable"
+ for pc in $mozilla_xpcom_pcs; do
+ if $PKG_CONFIG --exists $pc; then
+ mozilla_xpcom=$pc
+ XUL_VERSION=3
+ version="$(pkg-config --modversion $pc)"
+ minor=`echo "$version" | sed -e 's,\([[0-9]]*\)\..*,\1,'`
+ if test $minor -ge 2; then
+ XUL_VERSION=4
+ fi
+ AC_MSG_RESULT(Found $version)
+ break;
+ fi
+ done
+ fi
fi
if test -z $mozilla_xpcom; then
@@ -121,10 +128,13 @@
XPCOM_PKGS="$mozilla_xpcom"
fi
-AM_CONDITIONAL([OLDXUL], [test x$XUL_VERSION = x2])
-
AC_SUBST(XUL_VERSION)
+AM_CONDITIONAL([XUL_4], [test x$XUL_VERSION = x4])
+AM_CONDITIONAL([XUL_3], [test x$XUL_VERSION = x3])
+AM_CONDITIONAL([XUL_2], [test x$XUL_VERSION = x2])
+
+
AC_ARG_ENABLE([optimize],
AC_HELP_STRING([--enable-optimize], [Enable optimizations (-O2)]),
[
Sólo en gluezilla-2.6: configure.ac.orig
Sólo en gluezilla-2.6: configure.ac.rej
diff -ur gluezilla-2.6.orig/src/BrowserWindow.cpp gluezilla-2.6/src/BrowserWindow.cpp
--- gluezilla-2.6.orig/src/BrowserWindow.cpp 2011-03-27 18:51:37.000000000 +0200
+++ gluezilla-2.6/src/BrowserWindow.cpp 2011-03-27 18:51:46.000000000 +0200
@@ -28,23 +28,6 @@
NS_GENERIC_FACTORY_CONSTRUCTOR(SecurityWarningDialogs)
NS_GENERIC_FACTORY_CONSTRUCTOR(PromptService)
-static const nsModuleComponentInfo components[] = {
- {
- SECURITYWARNINGSDIALOGS_CLASSNAME,
- SECURITYWARNINGSDIALOGS_CID,
- NS_SECURITYWARNINGDIALOGS_CONTRACTID,
- SecurityWarningDialogsConstructor
- },
- {
- PROMPTSERVICE_CLASSNAME,
- PROMPTSERVICE_CID,
- NS_PROMPTSERVICE_CONTRACTID,
- PromptServiceConstructor
- }
-
-};
-
-
BrowserWindow::BrowserWindow (void)
{
owner = nsnull;
@@ -162,17 +145,17 @@
nsCOMPtr<nsIFactory> componentFactory;
rv = NS_NewSecurityWarningServiceFactory(getter_AddRefs(componentFactory));
if (NS_SUCCEEDED(rv)) {
- compReg->RegisterFactory(components[0].mCID,
- components[0].mDescription,
- components[0].mContractID,
+ compReg->RegisterFactory(kSECURITYWARNINGSDIALOGS_CID,
+ SECURITYWARNINGSDIALOGS_CLASSNAME,
+ NS_SECURITYWARNINGDIALOGS_CONTRACTID,
componentFactory);
}
rv = NS_NewPromptServiceFactory(getter_AddRefs(componentFactory), this);
if (NS_SUCCEEDED(rv)) {
- compReg->RegisterFactory(components[1].mCID,
- components[1].mDescription,
- components[1].mContractID,
+ compReg->RegisterFactory(kPROMPTSERVICE_CID,
+ PROMPTSERVICE_CLASSNAME,
+ NS_PROMPTSERVICE_CONTRACTID,
componentFactory);
}
diff -ur gluezilla-2.6.orig/src/Makefile.am gluezilla-2.6/src/Makefile.am
--- gluezilla-2.6.orig/src/Makefile.am 2011-03-27 18:51:37.000000000 +0200
+++ gluezilla-2.6/src/Makefile.am 2011-03-27 18:51:46.000000000 +0200
@@ -26,7 +26,7 @@
gluezilla.h \
FastDelegate.h
-if OLDXUL
+if XUL_2
libgluezilla_la_SOURCES += \
gluezilla_nsIScriptContext.h \
gluezilla_nsIScriptGlobalObject.h
diff -ur gluezilla-2.6.orig/src/PromptService.h gluezilla-2.6/src/PromptService.h
--- gluezilla-2.6.orig/src/PromptService.h 2011-03-27 18:51:37.000000000 +0200
+++ gluezilla-2.6/src/PromptService.h 2011-03-27 18:51:46.000000000 +0200
@@ -20,8 +20,9 @@
// {77686174-2061-6d20-6920-746F20646F20}
#define PROMPTSERVICE_CID \
{ 0x77686174, 0x2061, 0x6d20, { 0x69, 0x20, 0x74, 0x6F, 0x20, 0x64, 0x6F, 0x20 } }
-
-
+
+static NS_DEFINE_CID(kPROMPTSERVICE_CID, PROMPTSERVICE_CID);
+
class PromptService : public nsIPromptService
{
NS_DECL_ISUPPORTS
diff -ur gluezilla-2.6.orig/src/SecurityWarningsDialogs.h gluezilla-2.6/src/SecurityWarningsDialogs.h
--- gluezilla-2.6.orig/src/SecurityWarningsDialogs.h 2011-03-27 18:51:37.000000000 +0200
+++ gluezilla-2.6/src/SecurityWarningsDialogs.h 2011-03-27 18:51:46.000000000 +0200
@@ -21,8 +21,9 @@
// {696E7465-7265-7374-696E-67206C696665}
#define SECURITYWARNINGSDIALOGS_CID \
{ 0x696E7465, 0x7265, 0x7374, { 0x69, 0x6E, 0x67, 0x20, 0x6C, 0x69, 0x66, 0x65 } }
-
-
+
+static NS_DEFINE_CID(kSECURITYWARNINGSDIALOGS_CID, SECURITYWARNINGSDIALOGS_CID);
+
class SecurityWarningDialogs : public nsISecurityWarningDialogs
{
public:
diff -ur gluezilla-2.6.orig/src/interfaces.h gluezilla-2.6/src/interfaces.h
--- gluezilla-2.6.orig/src/interfaces.h 2011-03-27 18:51:37.000000000 +0200
+++ gluezilla-2.6/src/interfaces.h 2011-03-27 18:51:46.000000000 +0200
@@ -4,7 +4,18 @@
#define TO_STRING(x) #x
//Gecko Embedding API
+#if XUL_VERSION < 4
#include <nsEmbedAPI.h>
+#else
+#include <nscore.h>
+#include <nsXPCOM.h>
+#include <nsILocalFile.h>
+#include <nsIDirectoryService.h>
+#define NS_GRE_COMPONENT_DIR "GreComsD"
+#define NS_XPCOM_COMPONENT_DIR "ComsD"
+#define NS_XPCOM_COMPONENT_REGISTRY_FILE "ComRegF"
+#define NS_XPCOM_XPTI_REGISTRY_FILE "XptiRegF"
+#endif
//XPCOM API
#include <nsCOMPtr.h>
@@ -78,8 +89,12 @@
#include <nsIPromptService.h>
#include <nsISecurityWarningDialogs.h>
#include <nsIComponentRegistrar.h>
+#if XUL_VERSION < 4
#include <nsIGenericFactory.h>
-
+#else
+#include <mozilla/ModuleUtils.h>
+struct nsModuleComponentInfo;
+#endif
// preferences
#include <nsIPrefBranch.h>
#include <nsIPrefService.h>
@@ -131,12 +146,15 @@
typedef type (NS_FROZENCALL * name##Type) params; \
extern name##Type name NS_HIDDEN;
+#if XUL_VERSION < 4
XRE_API(nsresult,
XRE_InitEmbedding, (nsILocalFile *aLibXULDirectory,
nsILocalFile *aAppDirectory,
nsIDirectoryServiceProvider *aAppDirProvider,
nsStaticModuleInfo const *aStaticComponents,
PRUint32 aStaticComponentCount))
+#endif
+
XRE_API(void, XRE_TermEmbedding, ())

@ -1,26 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gluezilla/gluezilla-2.6-r1.ebuild,v 1.6 2011/03/27 17:00:10 pacho Exp $
EAPI=2
inherit go-mono mono autotools
DESCRIPTION="A simple library to embed Gecko (xulrunner) in the Mono Winforms WebControl"
HOMEPAGE="http://mono-project.com/Gluezilla"
LICENSE="LGPL-2 MPL-1.1"
KEYWORDS="amd64 ppc x86"
SLOT="0"
IUSE=""
RDEPEND="net-libs/xulrunner:1.9
x11-libs/gtk+:2
>=dev-lang/mono-${PV}
"
DEPEND="${RDEPEND}"
src_prepare() {
epatch "${FILESDIR}/${P}-xulrunner2.patch"
eautoreconf
}

@ -1,2 +1,2 @@
DIST cabal-install-0.10.2.tar.gz 150699 RMD160 d8a5942a3b318e045857b13a45f5b22f44c3456e SHA1 fd81e8f7d97be24934c92ef19c4e0fcb7f5cff5a SHA256 6357c8b984d193a30bb2a05e03dbd551650a0ddea17f7d1033e6564f5b7ff515
DIST cabal-install-0.13.3.tar.gz 185898 RMD160 e07310887175338f742292a26c206341893389f2 SHA1 8e59337524c65229709a5049497423bde60faa48 SHA256 f4bc32aff1a306c7e9a675399d78c2296288b0534a32f30427390481adbe0d43
DIST cabal-install-0.14.0.tar.gz 193187 RMD160 a0e1e0f0d189abbb984d968f8650280632027769 SHA1 614a683ec15a8d9b77e8d926c6906e8d00e3d401 SHA256 f4f2b50269ff59d67b5f3d82d50f7706b6bad1117295a7c81f32bbe72add5bd8

@ -1,18 +1,17 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal-install/cabal-install-0.13.3.ebuild,v 1.3 2012/04/03 20:41:50 slyfox Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal-install/cabal-install-0.14.0.ebuild,v 1.1 2012/04/17 21:16:52 slyfox Exp $
# ebuild generated by hackport 0.2.14
# ebuild generated by hackport 0.2.17.9999
EAPI="3"
EAPI=4
CABAL_FEATURES="bin"
inherit haskell-cabal bash-completion-r1 eutils
DESCRIPTION="The command-line interface for Cabal and Hackage."
HOMEPAGE="http://www.haskell.org/cabal/"
#SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
SRC_URI="http://code.haskell.org/~slyfox/snapshots/${P}.tar.gz"
SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
@ -21,9 +20,9 @@ IUSE="+noprefs"
RDEPEND=""
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.13.3 <dev-haskell/cabal-1.15
>=dev-haskell/cabal-1.14.0 <dev-haskell/cabal-1.15
>=dev-haskell/http-4000.0.2 <dev-haskell/http-4001
>=dev-haskell/mtl-1.1 <dev-haskell/mtl-3
>=dev-haskell/mtl-2.0 <dev-haskell/mtl-3
>=dev-haskell/network-1 <dev-haskell/network-3
>=dev-haskell/random-1 <dev-haskell/random-1.1
>=dev-haskell/time-1.1 <dev-haskell/time-1.5

@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/crypto/crypto-4.2.4.ebuild,v 1.2 2012/03/16 21:48:59 slyfox Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/crypto/crypto-4.2.4.ebuild,v 1.3 2012/04/17 19:42:55 slyfox Exp $
# ebuild generated by hackport 0.2.13
EAPI="3"
CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
inherit haskell-cabal
inherit base haskell-cabal
MY_PN="Crypto"
MY_P="${MY_PN}-${PV}"
@ -29,6 +29,8 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${MY_P}"
PATCHES=("${FILESDIR}/${PN}-4.2.4-ghc-7.4.patch")
src_test() {
TESTS="SymmetricTest SHA1Test RSATest QuickTest HMACTest WordListTest"

@ -0,0 +1,27 @@
--- Crypto-4.2.4-orig/Data/Digest/SHA2.hs 2011-09-08 10:30:07.000000000 +1000
+++ Crypto-4.2.4/Data/Digest/SHA2.hs 2011-12-20 13:28:26.401971284 +1100
@@ -106,7 +106,7 @@
data Hash384 = Hash384 !Word64 !Word64 !Word64 !Word64 !Word64 !Word64 deriving (Eq, Ord)
data Hash224 = Hash224 !Word32 !Word32 !Word32 !Word32 !Word32 !Word32 !Word32 deriving (Eq, Ord)
-instance (Integral a) => Show (Hash8 a) where
+instance (Integral a, Show a) => Show (Hash8 a) where
showsPrec _ (Hash8 a b c d e f g h) =
(showHex a) . (' ':) .
(showHex b) . (' ':) .
@@ -146,7 +146,7 @@
where
bs = bitSize (head r)
-instance (Integral h, Bits h) => Hash (Hash8 h) where
+instance (Integral h, Bits h, Show h) => Hash (Hash8 h) where
toOctets (Hash8 x0 x1 x2 x3 x4 x5 x6 x7) = bitsToOctets =<< [x0, x1, x2, x3, x4, x5, x6, x7]
instance Hash Hash384 where
@@ -282,4 +282,4 @@
-- Test with:
-- ghc -no-recomp -O --make Data/Digest/SHA2.hs -main-is Data.Digest.SHA2.moduleTest -o moduleTest && ./moduleTest && rm moduleTest
-moduleTest = runTestTT test_sha2
\ No newline at end of file
+moduleTest = runTestTT test_sha2

@ -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-haskell/dataenc/dataenc-0.14.0.2.ebuild,v 1.3 2012/04/05 20:44:59 phajdan.jr Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/dataenc/dataenc-0.14.0.2.ebuild,v 1.4 2012/04/16 21:00:45 ranger Exp $
# ebuild generated by hackport 0.2.13
@ -15,7 +15,7 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
IUSE=""
RDEPEND=">=dev-lang/ghc-6.8.2"

@ -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-haskell/hscolour/hscolour-1.19.ebuild,v 1.3 2012/04/05 20:46:14 phajdan.jr Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hscolour/hscolour-1.19.ebuild,v 1.4 2012/04/16 21:01:37 ranger Exp $
EAPI="3"
@ -13,7 +13,7 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
IUSE=""
RDEPEND=">=dev-lang/ghc-6.6.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-haskell/hunit/hunit-1.2.4.2.ebuild,v 1.3 2012/04/05 20:47:28 phajdan.jr Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hunit/hunit-1.2.4.2.ebuild,v 1.4 2012/04/16 21:02:33 ranger Exp $
# ebuild generated by hackport 0.2.13
@ -18,7 +18,7 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
IUSE=""
RDEPEND=">=dev-lang/ghc-6.8.2"

@ -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-haskell/hxt/hxt-9.1.5.ebuild,v 1.1 2011/12/04 16:59:13 slyfox Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hxt/hxt-9.1.5.ebuild,v 1.2 2012/04/17 20:06:08 slyfox Exp $
# ebuild generated by hackport 0.2.13
EAPI="3"
CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
inherit base haskell-cabal
DESCRIPTION="A collection of tools for processing XML with Haskell."
HOMEPAGE="http://www.fh-wedel.de/~si/HXmlToolbox/index.html"

@ -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-haskell/regex-base/regex-base-0.93.2.ebuild,v 1.4 2012/04/14 09:20:17 gienah Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/regex-base/regex-base-0.93.2.ebuild,v 1.5 2012/04/16 21:04:21 ranger Exp $
EAPI=4
@ -13,7 +13,7 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
RDEPEND=">=dev-lang/ghc-6.6

@ -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-haskell/regex-posix/regex-posix-0.95.1.ebuild,v 1.5 2012/04/14 09:36:38 gienah Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/regex-posix/regex-posix-0.95.1.ebuild,v 1.6 2012/04/16 21:05:14 ranger Exp $
# ebuild generated by hackport 0.2.13
@ -15,7 +15,7 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
RDEPEND=">=dev-haskell/regex-base-0.93[profile?]

@ -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-haskell/utf8-string/utf8-string-0.3.7.ebuild,v 1.3 2012/04/05 20:51:11 phajdan.jr Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/utf8-string/utf8-string-0.3.7.ebuild,v 1.4 2012/04/16 21:06:06 ranger Exp $
CABAL_FEATURES="lib profile haddock hscolour hoogle"
inherit haskell-cabal
@ -11,7 +11,7 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
IUSE=""
DEPEND=">=dev-lang/ghc-6.6.1

@ -9,6 +9,5 @@
</longdescription>
<use>
<flag name="webkit">Embedded browser support via net-libs/webkit-gtk:2, replacing former xulrunner-based browser.</flag>
<flag name="xulrunner">Embedded browser support via xulrunner-1.9 (1.8 for swt-3.3). Xulrunner 2.0 is not supported, will be replaced by webkit in 3.7.</flag>
</use>
</pkgmetadata>

@ -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-java/swt/swt-3.4-r4.ebuild,v 1.9 2011/03/29 09:17:56 caster Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.4-r4.ebuild,v 1.10 2012/04/17 11:19:53 ssuominen Exp $
EAPI="1"
@ -32,7 +32,7 @@ SLOT="3.4"
LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
KEYWORDS="amd64 ppc ppc64 x86"
IUSE="cairo gnome opengl xulrunner"
IUSE="cairo gnome opengl"
COMMON=">=dev-libs/glib-2.6
>=x11-libs/gtk+-2.6.8:2
>=dev-libs/atk-1.10.2
@ -42,7 +42,6 @@ COMMON=">=dev-libs/glib-2.6
=gnome-base/gnome-vfs-2*
=gnome-base/libgnomeui-2*
)
xulrunner? ( net-libs/xulrunner:1.9 )
opengl? (
virtual/opengl
virtual/glu
@ -148,28 +147,6 @@ src_compile() {
${make} make_gnome || die "Failed to build GNOME VFS support"
fi
if use xulrunner ; then
einfo "Building the Mozilla component against xulrunner-1.9"
export MOZILLA_INCLUDES="$(pkg-config --cflags libxul libxul-embedding)"
# the -R is a workaround for bug #234934
export MOZILLA_LIBS="-Wl,-R$(pkg-config libxul --variable=sdkdir) $(pkg-config --libs libxul libxul-embedding)"
${make} make_mozilla || die "Failed to build Mozilla support"
# upstream ships libswt-xulrunner*.so even though the build.sh does not
# build it anymore... missing this file leads to another instance
# of bug #234934 so we build it too
einfo "Building the xulrunner component against xulrunner-1.9"
export XULRUNNER_INCLUDES="${MOZILLA_INCLUDES}"
export XULRUNNER_LIBS="${MOZILLA_LIBS}"
${make} make_xulrunner || die "Failed to build xulrunner support"
${make} make_xpcominit || die "Failed to build xpcominit support"
fi
if use cairo ; then
einfo "Building CAIRO support"
${make} make_cairo || die "Unable to build CAIRO support"
@ -203,18 +180,5 @@ src_install() {
java-pkg_sointo /usr/$(get_libdir)
java-pkg_doso *.so
if use xulrunner; then
local gecko_dir="$(pkg-config libxul --variable=sdkdir)"
java-pkg_register-environment-variable MOZILLA_FIVE_HOME "${gecko_dir}"
fi
dohtml about.html || die
}
pkg_postinst() {
if use xulrunner; then
local gecko_dir="$(pkg-config libxul --variable=sdkdir)"
elog "You built swt with xulrunner support. For your custom applications please set"
elog "MOZILLA_FIVE_HOME environment variable to ${gecko_dir}"
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/dev-java/swt/swt-3.5.2.ebuild,v 1.7 2011/03/29 09:17:56 caster Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.5.2.ebuild,v 1.8 2012/04/17 11:19:53 ssuominen Exp $
EAPI=2
@ -32,7 +32,7 @@ SLOT="3.5"
LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
KEYWORDS="amd64 ppc ppc64 x86"
IUSE="cairo gnome opengl xulrunner"
IUSE="cairo gnome opengl"
COMMON=">=dev-libs/glib-2.6
>=x11-libs/gtk+-2.6.8:2
>=dev-libs/atk-1.10.2
@ -42,7 +42,6 @@ COMMON=">=dev-libs/glib-2.6
=gnome-base/gnome-vfs-2*
=gnome-base/libgnomeui-2*
)
xulrunner? ( =net-libs/xulrunner-1.9* )
opengl? (
virtual/opengl
virtual/glu
@ -139,28 +138,6 @@ src_compile() {
${make} make_gnome || die "Failed to build GNOME VFS support"
fi
if use xulrunner ; then
einfo "Building the Mozilla component against xulrunner-1.9"
export MOZILLA_INCLUDES="$(pkg-config --cflags libxul libxul-embedding)"
# the -R is a workaround for bug #234934
export MOZILLA_LIBS="-Wl,-R$(pkg-config libxul --variable=sdkdir) $(pkg-config --libs libxul libxul-embedding)"
${make} make_mozilla || die "Failed to build Mozilla support"
# upstream ships libswt-xulrunner*.so even though the build.sh does not
# build it anymore... missing this file leads to another instance
# of bug #234934 so we build it too
einfo "Building the xulrunner component against xulrunner-1.9"
export XULRUNNER_INCLUDES="${MOZILLA_INCLUDES}"
export XULRUNNER_LIBS="${MOZILLA_LIBS}"
${make} make_xulrunner || die "Failed to build xulrunner support"
${make} make_xpcominit || die "Failed to build xpcominit support"
fi
if use cairo ; then
einfo "Building CAIRO support"
${make} make_cairo || die "Unable to build CAIRO support"
@ -194,18 +171,5 @@ src_install() {
java-pkg_sointo /usr/$(get_libdir)
java-pkg_doso *.so
if use xulrunner; then
local gecko_dir="$(pkg-config libxul --variable=sdkdir)"
java-pkg_register-environment-variable MOZILLA_FIVE_HOME "${gecko_dir}"
fi
dohtml about.html || die
}
pkg_postinst() {
if use xulrunner; then
local gecko_dir="$(pkg-config libxul --variable=sdkdir)"
elog "You built swt with xulrunner support. For your custom applications please set"
elog "MOZILLA_FIVE_HOME environment variable to ${gecko_dir}"
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/dev-java/swt/swt-3.6.1.ebuild,v 1.7 2011/03/29 09:17:56 caster Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.6.1.ebuild,v 1.8 2012/04/17 11:19:53 ssuominen Exp $
EAPI=2
@ -32,7 +32,7 @@ SLOT="3.6"
LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
KEYWORDS="amd64 ppc ppc64 x86"
IUSE="cairo gnome opengl xulrunner"
IUSE="cairo gnome opengl"
COMMON=">=dev-libs/glib-2.6
>=x11-libs/gtk+-2.6.8:2
>=dev-libs/atk-1.10.2
@ -42,7 +42,6 @@ COMMON=">=dev-libs/glib-2.6
=gnome-base/gnome-vfs-2*
=gnome-base/libgnomeui-2*
)
xulrunner? ( =net-libs/xulrunner-1.9* )
opengl? (
virtual/opengl
virtual/glu
@ -139,28 +138,6 @@ src_compile() {
${make} make_gnome || die "Failed to build GNOME VFS support"
fi
if use xulrunner ; then
einfo "Building the Mozilla component against xulrunner-1.9"
export MOZILLA_INCLUDES="$(pkg-config --cflags libxul libxul-embedding)"
# the -R is a workaround for bug #234934
export MOZILLA_LIBS="-Wl,-R$(pkg-config libxul --variable=sdkdir) $(pkg-config --libs libxul libxul-embedding)"
${make} make_mozilla || die "Failed to build Mozilla support"
# upstream ships libswt-xulrunner*.so even though the build.sh does not
# build it anymore... missing this file leads to another instance
# of bug #234934 so we build it too
einfo "Building the xulrunner component against xulrunner-1.9"
export XULRUNNER_INCLUDES="${MOZILLA_INCLUDES}"
export XULRUNNER_LIBS="${MOZILLA_LIBS}"
${make} make_xulrunner || die "Failed to build xulrunner support"
${make} make_xpcominit || die "Failed to build xpcominit support"
fi
if use cairo ; then
einfo "Building CAIRO support"
${make} make_cairo || die "Unable to build CAIRO support"
@ -194,18 +171,5 @@ src_install() {
java-pkg_sointo /usr/$(get_libdir)
java-pkg_doso *.so
if use xulrunner; then
local gecko_dir="$(pkg-config libxul --variable=sdkdir)"
java-pkg_register-environment-variable MOZILLA_FIVE_HOME "${gecko_dir}"
fi
dohtml about.html || die
}
pkg_postinst() {
if use xulrunner; then
local gecko_dir="$(pkg-config libxul --variable=sdkdir)"
elog "You built swt with xulrunner support. For your custom applications please set"
elog "MOZILLA_FIVE_HOME environment variable to ${gecko_dir}"
fi
}

@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/elfutils-0.153.ebuild,v 1.2 2012/02/28 21:52:39 vapier Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/elfutils-0.153.ebuild,v 1.3 2012/04/16 22:53:58 vapier Exp $
EAPI="3"
inherit eutils
inherit eutils flag-o-matic
DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
HOMEPAGE="https://fedorahosted.org/elfutils/"
@ -15,7 +15,7 @@ SRC_URI="https://fedorahosted.org/releases/e/l/${PN}/${PV}/${P}.tar.bz2
LICENSE="GPL-2-with-exceptions"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="bzip2 lzma nls zlib"
IUSE="bzip2 lzma nls test zlib"
# This pkg does not actually seem to compile currently in a uClibc
# environment (xrealloc errs), but we need to ensure that glibc never
@ -39,6 +39,7 @@ src_prepare() {
}
src_configure() {
use test && append-flags -g #407135
econf \
$(use_enable nls) \
--program-prefix="eu-" \

@ -1,4 +1,2 @@
DIST libev-3.8.tar.gz 470250 RMD160 63398782022f3047f6e8587b802e072cfe4094c8 SHA1 cc57a3e6e171738aaa9d6af35ea66624a0a62b51 SHA256 25e353af5707bc4261276e02901ad469e1a46c589eaf5f66c5d3275c98b12294
DIST libev-3.9.tar.gz 473062 RMD160 b3a2c9a5a03be1120512d81c534b3ed4f2b39295 SHA1 a006a91346efd070359f4ad5c5077a0bac6fcee5 SHA256 0b81cb55a8eb0a2e3d2364a397e244812dd6dd496e860ed7bf143e39e4c21c2e
DIST libev-4.03.tar.gz 471094 RMD160 504dd1b2190fdaa1624f2ab1d1875c7ba9bffe00 SHA1 98f8c1ecac4751c04e3607e7de405c5f42174d0b SHA256 0af5149df84ddcd0041fc23f2b4de8b4fd6ce96389a63c606310efdba101f08f
DIST libev-4.04.tar.gz 471713 RMD160 cd82228834c51cf152a0214b77a57b0359aead7b SHA1 7768c2bcce30dbf76672e51642a655479dd45772 SHA256 ab3a09e967e3b868055cd9363fd236aa093f8643d19cc7042e90e0dfe905b012
DIST libev-4.11.tar.gz 484766 RMD160 524b86e24b45ff01bf79775f9ce9374f792b3c4c SHA1 e7752a518742c0f8086a8005aa7efcc4dcf02ed9 SHA256 9f55f16ff6e4d60a1b1fa7f4962af69768468f0d7c362aab6387f52020938cdf

@ -0,0 +1,42 @@
--- /dev/null
+++ b/libev.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libev
+Description: A high-performance event loop/event model with lots of features
+Version: @VERSION@
+Libs: -L${libdir} -lev
+Libs.private:
+Cflags: -I${includedir}
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,5 +16,8 @@ lib_LTLIBRARIES = libev.la
libev_la_SOURCES = ev.c event.c
libev_la_LDFLAGS = -version-info $(VERSION_INFO)
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libev.pc
+
ev.3: ev.pod
pod2man -n LIBEV -r "libev-$(VERSION)" -c "libev - high performance full featured event loop" -s3 <$< >$@
--- a/configure.ac
+++ b/configure.ac
@@ -2,6 +2,7 @@ orig_CFLAGS="$CFLAGS"
AC_INIT
AC_CONFIG_SRCDIR([ev_epoll.c])
+AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE(libev,4.11) dnl also update ev.h!
AC_CONFIG_HEADERS([config.h])
@@ -21,5 +22,5 @@ AC_PROG_LIBTOOL
m4_include([libev.m4])
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile libev.pc])
AC_OUTPUT

@ -1,36 +0,0 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libev/libev-3.80-r1.ebuild,v 1.4 2009/12/14 18:44:37 ranger Exp $
inherit autotools eutils
MY_P="${P/0}"
DESCRIPTION="A high-performance event loop/event model with lots of feature"
HOMEPAGE="http://software.schmorp.de/pkg/libev.html"
SRC_URI="http://dist.schmorp.de/libev/${MY_P}.tar.gz
http://dist.schmorp.de/libev/Attic/${MY_P}.tar.gz"
LICENSE="|| ( BSD GPL-2 )"
SLOT="0"
KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
IUSE=""
# Bug #283558
DEPEND=">=sys-libs/glibc-2.9_p20081201"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${MY_P}"
src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}/${PN}-3.42-gentoo.patch"
eautoreconf
}
src_install() {
emake DESTDIR="${D}" install || die
dodoc Changes README
}

@ -1,37 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libev/libev-3.90-r2.ebuild,v 1.4 2011/01/26 01:06:50 jer Exp $
EAPI="3"
inherit autotools eutils
MY_P="${P/0}"
DESCRIPTION="A high-performance event loop/event model with lots of feature"
HOMEPAGE="http://software.schmorp.de/pkg/libev.html"
SRC_URI="http://dist.schmorp.de/libev/${MY_P}.tar.gz
http://dist.schmorp.de/libev/Attic/${MY_P}.tar.gz"
LICENSE="|| ( BSD GPL-2 )"
SLOT="0"
KEYWORDS="~amd64 arm hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="elibc_glibc"
# Bug #283558
DEPEND="elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 )"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${MY_P}"
src_prepare() {
epatch "${FILESDIR}/${PN}-3.42-gentoo.patch" \
"${FILESDIR}/${P}-ev++.patch"
eautoreconf
}
src_install() {
emake DESTDIR="${D}" install || die
dodoc Changes README || die
}

@ -1,10 +1,10 @@
# 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-libs/libev/libev-4.03.ebuild,v 1.1 2011/01/26 16:51:43 matsuu Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libev/libev-4.11.ebuild,v 1.1 2012/04/16 23:37:01 matsuu Exp $
EAPI="3"
inherit autotools eutils
inherit autotools eutils multilib
MY_P="${P}"
@ -26,6 +26,8 @@ S="${WORKDIR}/${MY_P}"
src_prepare() {
epatch "${FILESDIR}/4.01-gentoo.patch"
# bug #411847
epatch "${FILESDIR}/${PN}-pc.patch"
eautoreconf
}
@ -37,5 +39,16 @@ src_configure() {
src_install() {
emake DESTDIR="${D}" install || die
if ! use static-libs ; then
find "${ED}" -name '*.la' -delete || die
fi
dodoc Changes README || die
}
pkg_preinst() {
preserve_old_lib /usr/$(get_libdir)/libev.so.3.0.0
}
pkg_postinst() {
preserve_old_lib_notify /usr/$(get_libdir)/libev.so.3.0.0
}

@ -0,0 +1 @@
DIST libverto-0.2.4.tar.gz 341895 RMD160 e4ec68286e5cd04169da72a33145b49154b8155e SHA1 6d8426ac8b5a6351d7e1568f85dbb93414feed86 SHA256 36499ea1195d9185f005a74186eaddb3ad878400a5329e6d4bd76dd0faaaffbb

@ -0,0 +1,60 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libverto/libverto-0.2.4.ebuild,v 1.1 2012/04/18 08:53:12 eras Exp $
EAPI=4
inherit autotools
DESCRIPTION="Main event loop abstraction library"
HOMEPAGE="https://fedorahosted.org/libverto/"
SRC_URI="https://fedorahosted.org/releases/l/i/libverto/${P}.tar.gz"
LICENSE="as-is"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="glib +libev libevent tevent +threads static-libs"
# file collisions
DEPEND="!=app-crypt/mit-krb5-1.10.1-r0
!=app-crypt/mit-krb5-1.10.1-r1
!=app-crypt/mit-krb5-1.10.1-r2
glib? ( >=dev-libs/glib-2.29 )
libev? ( >=dev-libs/libev-4.11 )
libevent? ( >=dev-libs/libevent-2.0 )
tevent? ( sys-libs/tevent )"
RDEPEND="${DEPEND}"
REQUIRED_USE="|| ( glib libev libevent tevent ) "
src_prepare() {
if ! use static-libs; then
sed -i -e 's/libverto.a/libverto.so/' tests/Makefile.{am,in} || die
fi
sed -i -e '/^AC_CHECK_LIB/i PKG_PROG_PKG_CONFIG' configure.ac || die
# known problem uptream with tevent write test. tevent does not fire a
# callback on error, but we explicitly test for this behaviour. Do not run
# tevent tests for now.
sed -i -e 's/def HAVE_TEVENT/ 0/' tests/test.h || die
eautoreconf
}
src_configure() {
econf \
$(use_with glib) \
$(use_with libev) \
$(use_with libevent) \
$(use_with tevent) \
$(use_with threads pthread) \
$(use_enable static-libs static)
}
src_install() {
emake DESTDIR="${D}" install
dodoc AUTHORS ChangeLog NEWS INSTALL README
use static-libs || find "${D}" -name '*.la' -delete
}

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<longdescription lang="en">Many applications and libraries are unable to write asynchronous code because they are unable to pick an event loop. This is particularly true of libraries who want to be useful to many applications who use loops that do not integrate with one another or which use home-grown loops. libverto provides a loop-neutral async api which allows the library to expose asynchronous interfaces and offload the choice of the main loop to the application.</longdescription>
<maintainer>
<email>eras@gentoo.org</email>
<name>Eray Aslan</name>
</maintainer>
<use>
<flag name="glib">Support event loops using <pkg>dev-libs/glib</pkg></flag>
<flag name="libev">Support event loops using <pkg>dev-libs/libev</pkg></flag>
<flag name="libevent">Support event loops using <pkg>dev-libs/libevent</pkg></flag>
<flag name="tevent">Support event loops using <pkg>sys-libs/tevent</pkg></flag>
</use>
</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/dev-perl/Any-Moose/Any-Moose-0.180.0.ebuild,v 1.4 2012/04/05 06:58:30 jdhore Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Any-Moose/Any-Moose-0.180.0.ebuild,v 1.6 2012/04/17 19:33:31 jer Exp $
EAPI=4
@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Use Moose or Mouse modules"
SLOT="0"
KEYWORDS="alpha amd64 ~hppa ia64 ~ppc sparc x86 ~ppc-macos"
KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86 ~ppc-macos"
IUSE=""
RDEPEND="|| ( >=dev-perl/Mouse-0.40 dev-perl/Moose )

@ -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-perl/Array-Compare/Array-Compare-2.20.0.ebuild,v 1.3 2012/04/04 08:58:35 jdhore Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Array-Compare/Array-Compare-2.20.0.ebuild,v 1.4 2012/04/16 21:21:49 ranger Exp $
EAPI=4
@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Perl extension for comparing arrays"
SLOT="0"
KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="test"
SRC_TEST="do"

@ -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-perl/BerkeleyDB/BerkeleyDB-0.500.0.ebuild,v 1.4 2012/04/04 08:50:44 jdhore Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-perl/BerkeleyDB/BerkeleyDB-0.500.0.ebuild,v 1.6 2012/04/17 21:52:17 ranger Exp $
EAPI=4
@ -11,7 +11,7 @@ inherit perl-module eutils db-use
DESCRIPTION="This module provides Berkeley DB interface for Perl."
SLOT="0"
KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86"
IUSE="test"
# Install DB_File if you want older support. BerkleyDB no longer

@ -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-perl/Cairo/Cairo-1.90.0.ebuild,v 1.4 2012/04/11 14:07:53 jer Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Cairo/Cairo-1.90.0.ebuild,v 1.6 2012/04/17 21:56:49 ranger Exp $
EAPI=4
@ -12,7 +12,7 @@ DESCRIPTION="Perl interface to the cairo library"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="test"
RDEPEND="

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

Loading…
Cancel
Save