Permalink
Browse files

glorious funtoo updates

merged:

  gentoo: 32ba10b872b38b0115f6c917ac85213aae7c08c8
  funtoo-overlay: 884425b3d6393d5f49773d5fcf169529bc723309
  foo-overlay: 735d96fb5a1390c37cecee05bc065560c14cc37d
  bar-overlay: fb087c5a693ccc4195a2b824a60290a724802b2c
  flora: 191b9cf2d427968fc10a7bc4b85d4d84ceb44f7a
  • Loading branch information...
1 parent 1a40b6f commit b7eea79d122f3ab3804876746b91502fec23276c @danielrobbins danielrobbins committed Jun 9, 2012
Showing 24,253 changed files with 26,924 additions and 27,775 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
@@ -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/lib_users/lib_users-0.5.ebuild,v 1.3 2012/06/07 21:16:56 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/lib_users/lib_users-0.5.ebuild,v 1.4 2012/06/09 06:44:07 jdhore Exp $
EAPI=3
PYTHON_DEPEND="2"
@@ -14,7 +14,7 @@ SRC_URI="http://schwarzvogel.de/pkgs/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha ~amd64 ~hppa ppc ~x86"
+KEYWORDS="alpha ~amd64 ~hppa ppc x86"
IUSE="test"
DEPEND="test? ( dev-python/nose )"
@@ -4,4 +4,4 @@ DIST dpkg_1.16.1.2.tar.bz2 5347162 RMD160 7f38018b8e4dbb59a2bd14a534f35ace78ff47
DIST dpkg_1.16.1.tar.bz2 5432348 RMD160 dd9d203001073278e397112729cb8d6d126a3ad7 SHA1 9e8176c88fe2b31782ddae6d0a8f599c7e540e8d SHA256 f9363628a6fa1c24a1e9c41bd8977f9d5a7010bfca3ac9a6f8bf500e7e8df52b
DIST dpkg_1.16.2.tar.bz2 5578978 RMD160 7a52df968e65fefa7616315ec7fd350026d7314b SHA1 43ea22771b0dd9eb5bf7ceaf672400e7196a2bea SHA256 53a77f694ce2269f17729b0e9626c59687683703e3822a2624b13da4a10fccc9
DIST dpkg_1.16.3.tar.bz2 5599915 RMD160 7175a4394a48c4a2158cb0f9b0be93c37e74cf11 SHA1 b82a62c1b5e85adcc947f28a264ef7b7ee8580ca SHA256 8048890ca92a3ca317a4fdd557f8e9b2b3ce560743e8e70813496f9a7096d8d8
-DIST dpkg_1.16.4.tar.bz2 5615914 RMD160 27559ae58939f65e5c8691e98da17535c2a6fc2e SHA1 58cf8a56152ca5bd548c5c23384c2f9b0ded0949 SHA256 15a3745d1fafae1e152dbbd5c8d4d3902f1922f54feb85bd8ac3f68a022f222d
+DIST dpkg_1.16.4.1.tar.bz2 5616024 RMD160 6676f1685fdfde21753e20838fd0f3b7cf5496cc SHA1 1832de7837bdf2ac2f78d2b40efb29568a39cc32 SHA256 7c9830131a52a9eb4d13276da4e29496fc92335ffc48e25b1e45402f03f99805
@@ -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-arch/dpkg/dpkg-1.16.4.ebuild,v 1.1 2012/06/08 15:58:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.16.4.1.ebuild,v 1.1 2012/06/09 13:52:42 jer Exp $
EAPI=4
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.20.1-r2.ebuild,v 1.2 2012/06/07 16:29:50 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.20.1-r3.ebuild,v 1.1 2012/06/09 14:43:20 jlec Exp $
EAPI=4
@@ -44,6 +44,8 @@ src_prepare() {
sed \
-e 's:-m32 ::g' \
-e 's:-m64 ::g' \
+ -e 's:-O::g' \
+ -e 's:-pipe::g' \
-e "/^CC/s:\$(ALLFLAGS):${CFLAGS} \$(ALLFLAGS):g" \
-e "/^CXX/s:\$(ALLFLAGS):${CXXFLAGS} \$(ALLFLAGS):g" \
-i makefile* || die
@@ -95,8 +97,8 @@ src_prepare() {
src_compile() {
emake all3
if use kde || use wxwidgets; then
- emake 7zG
- emake 7zFM
+ emake -- 7zG
+ emake -- 7zFM
fi
}
@@ -1,2 +1,3 @@
DIST duplicity-0.6.17.tar.gz 1119945 RMD160 e88bb833f7ed21f0b742caed9c28402c2b0601a5 SHA1 cee8f4793f3b2990447bb26c9131202930adf096 SHA256 891e56061ab15127e67c93b9b462760b055eb48636c177b56400925d0a77a458
DIST duplicity-0.6.18.tar.gz 1101351 RMD160 f90705358857e40fb6f427e3cc96d4f81b6b9ba2 SHA1 6cd97457e2f43af3cc270e2f16e8891880dc44a6 SHA256 56bc583be1031762dd94082cb30e09e1347167aaa88188f8d6d6c052ad8f90af
+DIST duplicity-0.6.19.tar.gz 1131760 RMD160 493336e8ac2c2f8a5dd15c441aa01d43aa426b06 SHA1 07d72680d6b4850101a436f679793521a51f41ac SHA256 f16a388d1ac4f8daf2bf9ffc2b277422ca367a8e56b9cdb5de0cd36b95ea5731
@@ -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-backup/duplicity/duplicity-0.6.17.ebuild,v 1.5 2012/03/04 10:51:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/duplicity/duplicity-0.6.17.ebuild,v 1.6 2012/06/09 15:38:15 jlec Exp $
EAPI="4"
@@ -10,7 +10,7 @@ RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
inherit distutils
-DESCRIPTION="duplicity is a secure backup system using gnupg to encrypt data"
+DESCRIPTION="Secure backup system using gnupg to encrypt data"
HOMEPAGE="http://www.nongnu.org/duplicity/"
SRC_URI="http://code.launchpad.net/${PN}/0.6-series/${PV}/+download/${P}.tar.gz"
@@ -20,7 +20,7 @@ KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="s3"
DEPEND="
- >=net-libs/librsync-0.9.6
+ net-libs/librsync
app-crypt/gnupg
"
RDEPEND="${DEPEND}
@@ -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-backup/duplicity/duplicity-0.6.18-r1.ebuild,v 1.4 2012/05/21 09:30:41 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/duplicity/duplicity-0.6.18-r1.ebuild,v 1.5 2012/06/09 15:38:15 jlec Exp $
EAPI="4"
@@ -10,7 +10,7 @@ RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
inherit distutils
-DESCRIPTION="duplicity is a secure backup system using gnupg to encrypt data"
+DESCRIPTION="Secure backup system using gnupg to encrypt data"
HOMEPAGE="http://www.nongnu.org/duplicity/"
SRC_URI="http://code.launchpad.net/${PN}/0.6-series/${PV}/+download/${P}.tar.gz"
@@ -20,7 +20,7 @@ KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="s3"
DEPEND="
- >=net-libs/librsync-0.9.6
+ net-libs/librsync
app-crypt/gnupg
"
RDEPEND="${DEPEND}
@@ -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-backup/duplicity/duplicity-0.6.18.ebuild,v 1.2 2012/03/04 10:51:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/duplicity/duplicity-0.6.18.ebuild,v 1.3 2012/06/09 15:38:15 jlec Exp $
EAPI="4"
@@ -10,7 +10,7 @@ RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
inherit distutils
-DESCRIPTION="duplicity is a secure backup system using gnupg to encrypt data"
+DESCRIPTION="Secure backup system using gnupg to encrypt data"
HOMEPAGE="http://www.nongnu.org/duplicity/"
SRC_URI="http://code.launchpad.net/${PN}/0.6-series/${PV}/+download/${P}.tar.gz"
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="s3"
DEPEND="
- >=net-libs/librsync-0.9.6
+ net-libs/librsync
app-crypt/gnupg
"
RDEPEND="${DEPEND}
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/duplicity/duplicity-0.6.19.ebuild,v 1.1 2012/06/09 15:38:15 jlec Exp $
+
+EAPI="4"
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+
+inherit distutils
+
+DESCRIPTION="Secure backup system using gnupg to encrypt data"
+HOMEPAGE="http://www.nongnu.org/duplicity/"
+SRC_URI="http://code.launchpad.net/${PN}/0.6-series/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="s3"
+
+DEPEND="
+ net-libs/librsync
+ app-crypt/gnupg
+"
+RDEPEND="${DEPEND}
+ dev-python/paramiko
+ >=dev-python/pexpect-2.1
+ >=dev-python/py-gnupg-0.3.2
+ s3? ( dev-python/boto )
+"
+
+src_prepare() {
+ distutils_src_prepare
+ sed -i -r "s/'COPYING',//" setup.py || die "Couldn't remove unnecessary COPYING file."
+}
@@ -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-editors/e3/e3-2.8.ebuild,v 1.4 2011/04/10 04:40:38 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/e3/e3-2.8.ebuild,v 1.5 2012/06/09 14:47:27 jlec Exp $
EAPI=3
@@ -23,9 +23,9 @@ src_prepare() {
src_compile() {
if use amd64; then
- emake 64 || die
+ emake -- 64 || die
else
- emake 32 || die
+ emake -- 32 || die
fi
}
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
-<longdescription>
+ <herd>emacs</herd>
+ <longdescription>
e3 is a full-screen, user-friendly text editor with an interface similar to
that of either WordStar, Emacs, Pico, Nedit, or vi. It's heavily optimized
for size and independent of libc or any other libraries, making it useful
@@ -1 +1,2 @@
DIST qxmledit-0.8.1-src.tgz 5439012 RMD160 fbe8830b115b9cd74d1d4a4d0268fdf79ac308b0 SHA1 e2226b7e5799f6196d9d14ba6de89a9d23c0e904 SHA256 0a9f526e1762f1b2c51821c3d2c543c9191bee7ec841219bd31108ea61c61d9a
+DIST qxmledit-0.8.2-src.tgz 5770059 RMD160 e6f957e5be42b4fc25dec77c1ebb4194d7dc49f0 SHA1 5c8fc013deb4d0eb634997b19bb480856e1d2358 SHA256 2852c340a91ced797a3626601be580084bbc29602e9f9221e27f58d16387bc09
@@ -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-editors/qxmledit/qxmledit-0.8.2.ebuild,v 1.1 2012/06/09 16:17:00 hwoarang Exp $
+
+EAPI=4
+
+inherit multilib eutils qt4-r2
+
+MY_P="qxmledit-${PV}-src"
+
+DESCRIPTION="Qt4 XML Editor"
+HOMEPAGE="http://code.google.com/p/qxmledit/"
+SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tgz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND=">=x11-libs/qt-core-4.7:4
+ >=x11-libs/qt-gui-4.7:4
+ >=x11-libs/qt-sql-4.7:4
+ >=x11-libs/qt-svg-4.7:4
+ >=x11-libs/qt-xmlpatterns-4.7:4"
+RDEPEND="${DEPEND}"
+
+DOCS="AUTHORS NEWS README ROADMAP TODO"
+
+src_prepare() {
+ # fix doc dir
+ sed -i "/INST_DOC_DIR = / s|/opt/${PN}|/usr/share/doc/${PF}|" \
+ src/QXmlEdit{,Widget}.pro src/sessions/QXmlEditSessions.pro || \
+ die "failed to fix doc installation path"
+ # fix binary installation path
+ sed -i "/INST_DIR = / s|/opt/${PN}|/usr/bin|" \
+ src/QXmlEdit{,Widget}.pro src/sessions/QXmlEditSessions.pro || \
+ die "failed to fix binary installation path"
+ # fix helper libraries installation path
+ sed -i "/INST_LIB_DIR = / s|/opt/${PN}|/usr/$(get_libdir)|" \
+ src/QXmlEdit{,Widget}.pro \
+ src/sessions/QXmlEditSessions.pro || \
+ die "failed to fix library installation path"
+ # fix translations
+ sed -i "/INST_DATA_DIR = / s|/opt|/usr/share|" src/QXmlEdit{,Widget}.pro \
+ src/sessions/QXmlEditSessions.pro || \
+ die "failed to fix translations"
+ # fix include
+ sed -i "/INST_INCLUDE_DIR = / s|/opt|/usr/share|" src/QXmlEditWidget.pro \
+ || die "failed to fix include directory"
+
+ qt4-r2_src_prepare
+}
+
+src_install() {
+ qt4-r2_src_install
+
+ newicon src/images/icon.png ${PN}.png
+ make_desktop_entry QXmlEdit QXmlEdit ${PN} "Qt;Utility;TextEditor"
+}
@@ -1 +1,2 @@
+DIST colordiff-1.0.10.tar.gz 17201 RMD160 d6f09399c79eebe4ca942da1ffb35fbbe2fca637 SHA1 eeedbe025b9f250134d91fd68fd3940748bbe102 SHA256 425ef6c8b1599fbabab639a6629ddddd1272e9485f3d93e2549a2d28e0bf97f9
DIST colordiff-1.0.9.tar.gz 17845 RMD160 b736f01e4107f368a7d98468a17ff8d4cb53bdb9 SHA1 52aa37957660b8060b186b949de58790ba816ab8 SHA256 b2c25d81c10f22380798f146cc5b54ffc5aeb6e5ca1208be2b9508fec1d8e4a6
@@ -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-misc/colordiff/colordiff-1.0.10.ebuild,v 1.1 2012/06/09 15:29:32 jlec Exp $
+
+EAPI=4
+
+inherit prefix
+
+DESCRIPTION="Colorizes output of diff"
+HOMEPAGE="http://colordiff.sourceforge.net/"
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+# Hasn't been copied to mirrors yet
+SRC_URI="http://${PN}.sourceforge.net/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND="sys-apps/diffutils"
+
+src_prepare() {
+ # set proper etcdir for Gentoo Prefix
+ sed -i -e "s:'/etc:'@GENTOO_PORTAGE_EPREFIX@/etc:" "${S}/colordiff.pl" \
+ || die "sed etcdir failed"
+ eprefixify "${S}"/colordiff.pl
+}
+
+# This package has a makefile, but we don't want to run it
+src_compile() { :; }
+
+src_install() {
+ newbin ${PN}{.pl,}
+ newbin cdiff.sh cdiff
+ insinto /etc
+ doins colordiffrc colordiffrc-lightbg
+ dodoc BUGS CHANGES README TODO
+ doman {cdiff,colordiff}.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/app-misc/detox/detox-1.2.0-r2.ebuild,v 1.1 2012/03/25 09:14:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/detox/detox-1.2.0-r2.ebuild,v 1.2 2012/06/09 07:20:48 jdhore Exp $
EAPI=4
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
S="${WORKDIR}"/${MY_P}
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tdl/tdl-1.5.2-r2.ebuild,v 1.1 2012/02/21 07:54:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tdl/tdl-1.5.2-r2.ebuild,v 1.2 2012/06/09 07:15:29 jdhore Exp $
EAPI=4
@@ -14,7 +14,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc x86"
IUSE="doc readline"
RDEPEND="
@@ -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-misc/when/when-1.1.29.ebuild,v 1.1 2011/12/22 01:11:13 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/when/when-1.1.29.ebuild,v 1.2 2012/06/09 07:02:54 jdhore Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="http://www.lightandmatter.com/when/when.tar.gz -> ${P}.tar.gz"
LICENSE="Artistic"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
DEPEND="dev-lang/perl"
@@ -1,3 +1,4 @@
DIST ganyremote-5.11.6.tar.gz 291746 RMD160 69176f282f4fbb22045cc62d6626e41c9f2b8ce9 SHA1 d3f11bafba2b7119f985f28937d59baa20be4619 SHA256 d21f7c287decaed427d126c948530c6697dae50e369618605a35624135d058cf
DIST ganyremote-5.12.tar.gz 292731 RMD160 b46e3c6e2bc191306acff12f4071c85a62acbfee SHA1 ffc6dfa403131f9c0264847098dc32b979655e5b SHA256 6872ccd7cad3e2bf954106e7ce3934d45a4c82ae2774a3bd6902dee4ab2264c0
DIST ganyremote-5.13.tar.gz 298125 RMD160 630b3428684e43bcec83cf0adacd817507485a0c SHA1 c351a62c83588281d8ea466b081408dbefd6cf14 SHA256 928aba568ddf39bcea7334f358aa79bff3d3274942c6b2bdfb5b52b1af3bf824
+DIST ganyremote-6.0.tar.gz 280068 RMD160 36da1211905c0aefb8cf8723987220b39552feeb SHA1 490aec5cf54860cb6054dad61e4de8ac962a851e SHA256 abf1579963883262f0159afdde796aea8c867526ba2c6aff4ea09229216fa34e
Oops, something went wrong.

0 comments on commit b7eea79

Please sign in to comment.