Permalink
Browse files

glorious funtoo updates

merged:

  gentoo: d114fb7dad4aa7e7187d6cee4f8211b2f9898896
  funtoo-overlay: 3fba2a591a90ea43014368dca3f84655db34102f
  foo-overlay: 8298ae4a92dd6e9925442616a6fc83e73c965abf
  bar-overlay: fb087c5a693ccc4195a2b824a60290a724802b2c
  flora: 189cfa2640ed21fd834be0e210377b2d0d566ac4
  • Loading branch information...
1 parent f3c722c commit b3c12cf39689df863a538439c3d0c31692f69fad @danielrobbins danielrobbins committed Jun 14, 2012
Showing 398 changed files with 5,494 additions and 4,388 deletions.
@@ -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/webapp-config/webapp-config-1.50.16-r4.ebuild,v 1.3 2012/06/14 02:00:32 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r4.ebuild,v 1.4 2012/06/14 06:35:06 jdhore Exp $
EAPI="3"
PYTHON_DEPEND="2"
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
IUSE=""
DEPEND=""
@@ -0,0 +1,24 @@
+From d8b9dbd6dac0125957b997c2fe8d246237ec9f94 Mon Sep 17 00:00:00 2001
+From: naota <naota@elisp.net>
+Date: Fri, 25 May 2012 13:03:21 +0900
+Subject: [PATCH] Avoid infinite loop when there's unsupported acl type
+
+---
+ libarchive/archive_read_disk_entry_from_file.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
+index 7987fa5..25b1edc 100644
+--- a/libarchive/archive_read_disk_entry_from_file.c
++++ b/libarchive/archive_read_disk_entry_from_file.c
+@@ -584,6 +584,7 @@ static int translate_acl(struct archive_read_disk *a,
+ break;
+ default:
+ /* Skip types that libarchive can't support. */
++ s = acl_get_entry(acl, ACL_NEXT_ENTRY, &acl_entry);
+ continue;
+ }
+
+--
+1.7.10
+
@@ -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/libarchive/libarchive-3.0.4.ebuild,v 1.2 2012/04/26 13:40:27 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-3.0.4-r1.ebuild,v 1.1 2012/06/14 16:44:33 ryao Exp $
EAPI=4
inherit eutils multilib
@@ -34,6 +34,10 @@ DEPEND="${RDEPEND}
DOCS="NEWS README"
+src_prepare() {
+ epatch "${FILESDIR}/${P}-handle-unsupported-acl-types.patch"
+}
+
src_configure() {
export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
@@ -1 +1,2 @@
DIST bootchart2-0.14.2.tar.bz2 775770 RMD160 cdfc030c12060737768cd6f6b55be508a8c517bc SHA1 75b3db97c239e8eee4c3143e35f77505480ec415 SHA256 0a9c9cd4065a1ad4d9e27e36888cf6258bb8c830a719e1a4afbf3b1092e728a4
+DIST bootchart2-0.14.4.tar.bz2 775936 RMD160 b54be20ce0f74d21cd58f78daa427dc12658588c SHA1 a5e9702717792e085e1d1798eb8d9317c2669be7 SHA256 9b2bd785569e0c49fe6082abfb488135f65bc82f7919e04857a4bd94471add7f
@@ -1,75 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart2/bootchart2-0.14.2-r1.ebuild,v 1.3 2012/05/15 14:31:22 jlec Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit linux-info python systemd toolchain-funcs
-
-DESCRIPTION="Performance analysis and visualization of the system boot process"
-HOMEPAGE="https://github.com/mmeeks/bootchart/"
-SRC_URI="mirror://github/mmeeks/bootchart/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="svg"
-
-RDEPEND="
- !app-benchmarks/bootchart
- dev-python/pycairo[svg?]
- dev-python/pygtk
- sys-apps/lsb-release"
-DEPEND="${RDEPEND}"
-
-CONFIG_CHECK="~PROC_EVENTS ~TASKSTATS ~TASK_DELAY_ACCT ~TMPFS"
-
-src_prepare() {
- tc-export CC
- sed \
- -e "/^install/s:py-install-compile::g" \
- -e "/^VER/s:0.14.1:0.14.2:g" \
- -e "/^SYSTEMD_UNIT_DIR/s:=.*:= $(systemd_get_unitdir):g" \
- -i Makefile || die
-}
-
-src_test() {
- testing() {
- emake test
- }
- python_execute_function testing
-}
-
-src_install() {
- export NO_PYTHON_COMPILE=0
- export DOCDIR=/usr/share/doc/${PF}
- default
-
- # Note: LIBDIR is hardcoded as /lib in collector/common.h, so we shouldn't
- # just change it. Since no libraries are installed, /lib is fine.
- keepdir /lib/bootchart/tmpfs
-
- installation() {
- emake \
- DESTDIR="${D}" \
- PY_SITEDIR=$(python_get_sitedir) \
- py-install-compile
- }
- python_execute_function installation
-
- newinitd "${FILESDIR}"/${PN}.init ${PN}
-}
-
-pkg_postinst() {
- elog "Please add the init script to your default runlevel"
- elog "rc-update add bootchart2 default"
- echo
- python_mod_optimize pybootchartgui
-}
-
-pkg_postrm() {
- python_mod_cleanup pybootchartgui
-}
@@ -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/bootchart2/bootchart2-0.14.2-r3.ebuild,v 1.1 2012/05/29 18:00:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart2/bootchart2-0.14.2-r3.ebuild,v 1.2 2012/06/14 06:31:21 jlec Exp $
EAPI=4
@@ -70,7 +70,9 @@ src_install() {
}
pkg_postinst() {
- elog "Please add the init script to your default runlevel"
+ elog "If you are using an initrd during boot"
+ echo
+ elog "please add the init script to your default runlevel"
elog "rc-update add bootchart2 default"
echo
python_mod_optimize pybootchartgui
@@ -1,11 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart2/bootchart2-0.14.2-r2.ebuild,v 1.3 2012/05/15 14:31:22 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart2/bootchart2-0.14.4.ebuild,v 1.1 2012/06/14 06:31:21 jlec Exp $
EAPI=4
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-pypy-*"
inherit linux-info python systemd toolchain-funcs
@@ -31,9 +32,11 @@ src_prepare() {
tc-export CC
sed \
-e "/^install/s:py-install-compile::g" \
- -e "/^VER/s:0.14.1:0.14.2:g" \
-e "/^SYSTEMD_UNIT_DIR/s:=.*:= $(systemd_get_unitdir):g" \
-i Makefile || die
+ sed \
+ -e '/^EXIT_PROC/s:^.*$:EXIT_PROC="agetty mgetty mingetty":g' \
+ -i bootchartd.conf bootchartd.in || die
}
src_test() {
@@ -67,7 +70,9 @@ src_install() {
}
pkg_postinst() {
- elog "Please add the init script to your default runlevel"
+ elog "If you are using an initrd during boot"
+ echo
+ elog "please add the init script to your default runlevel"
elog "rc-update add bootchart2 default"
echo
python_mod_optimize pybootchartgui
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-cyrus-sasl/qca-cyrus-sasl-2.0.0_beta3.ebuild,v 1.11 2010/03/26 23:38:18 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-cyrus-sasl/qca-cyrus-sasl-2.0.0_beta3.ebuild,v 1.12 2012/06/14 07:06:37 yngwin Exp $
EAPI="2"
inherit eutils qt4-r2
@@ -14,7 +14,7 @@ SRC_URI="http://delta.affinix.com/download/qca/${QCA_VER}/plugins/${MY_P}.tar.bz
LICENSE="LGPL-2"
SLOT="2"
-KEYWORDS="alpha amd64 ia64 ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~ia64 ppc64 sparc x86 ~x86-fbsd"
IUSE="debug"
DEPEND=">=app-crypt/qca-${QCA_VER}[debug?]
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-gnupg/qca-gnupg-2.0.0_beta3.ebuild,v 1.11 2010/03/26 23:41:47 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-gnupg/qca-gnupg-2.0.0_beta3.ebuild,v 1.12 2012/06/14 07:05:18 yngwin Exp $
EAPI="2"
inherit eutils qt4-r2
@@ -14,7 +14,7 @@ SRC_URI="http://delta.affinix.com/download/qca/${QCA_VER}/plugins/${MY_P}.tar.bz
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
IUSE="debug"
DEPEND=">=app-crypt/qca-${QCA_VER}[debug?]
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-logger/qca-logger-2.0.0_beta2.ebuild,v 1.11 2010/03/26 23:44:44 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-logger/qca-logger-2.0.0_beta2.ebuild,v 1.12 2012/06/14 07:03:19 yngwin Exp $
EAPI="2"
inherit eutils qt4-r2
@@ -14,7 +14,7 @@ SRC_URI="http://delta.affinix.com/download/qca/${QCA_VER}/plugins/${MY_P}.tar.bz
LICENSE="LGPL-2"
SLOT="2"
-KEYWORDS="alpha amd64 ia64 ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~ia64 ppc64 sparc x86 ~x86-fbsd"
IUSE="debug"
DEPEND=">=app-crypt/qca-${QCA_VER}[debug?]"
@@ -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-crypt/qca-ossl/qca-ossl-2.0.0_beta3-r2.ebuild,v 1.8 2011/08/17 16:41:55 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-ossl/qca-ossl-2.0.0_beta3-r2.ebuild,v 1.9 2012/06/14 07:01:37 yngwin Exp $
EAPI="2"
inherit eutils qt4-r2
@@ -14,7 +14,7 @@ SRC_URI="http://delta.affinix.com/download/qca/${QCA_VER}/plugins/${MY_P}.tar.bz
LICENSE="LGPL-2"
SLOT="2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris"
IUSE="debug"
DEPEND=">=app-crypt/qca-${QCA_VER}[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/app-crypt/qca/qca-2.0.3.ebuild,v 1.11 2012/05/17 13:10:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-2.0.3.ebuild,v 1.12 2012/06/14 07:08:45 yngwin Exp $
EAPI="3"
@@ -12,7 +12,7 @@ SRC_URI="http://delta.affinix.com/download/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="LGPL-2"
SLOT="2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
IUSE="aqua debug doc examples"
RESTRICT="test"
@@ -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-emacs/tuareg-mode/tuareg-mode-2.0.1.ebuild,v 1.5 2011/11/06 17:30:54 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/tuareg-mode/tuareg-mode-2.0.1.ebuild,v 1.6 2012/06/14 05:42:34 xmw Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="http://forge.ocamlcore.org/frs/download.php/410/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
IUSE=""
S="${WORKDIR}/tuareg-${PV}"
@@ -1,2 +1,3 @@
DIST jre-6u29-linux-i586.bin 21632980 RMD160 ce7ba2ec99643b6d47f6b634d7e9fa5877513b4a SHA1 6de26b992a9920117d2f156ff5bbddf2d5b28f77 SHA256 13bd1ce27709be7d05c07221185d4f572242b14a80cea67b557e761f5ba7e440
DIST jre-6u31-linux-i586.bin 21699103 RMD160 45252ef657d84abeaa1f22d8e3cfc7906a726645 SHA1 7fff7f6f99282ea3adc718c1f449df9107a8ad0c SHA256 c7c6882b8018e95ded4d145ae28692e2a0a4c13e66c5310d8f5c42b90b5b4dd0
+DIST jre-6u33-linux-i586.bin 21693745 RMD160 c395a2a780a3714673e4acd4a835e1ece1abd9bb SHA1 0eb29f15703fdcb567d64e15ed41a31a5a6ab66f SHA256 6e406b3552f276238141e40c65f83928df0bf93af5f11c74ac6970cde6758f0e
Oops, something went wrong. Retry.

0 comments on commit b3c12cf

Please sign in to comment.