Permalink
Browse files

glorious funtoo updates

merged:

  gentoo: 74af38d05ab160e7043a30b978b7182204d6946d
  funtoo-overlay: c9d827a1ef2cca05643da2dd106d5eea89892d7d
  foo-overlay: 8298ae4a92dd6e9925442616a6fc83e73c965abf
  bar-overlay: 6c956f1ca6178fed85bda46013da787239706d7c
  flora: 493fe31bca83de4017fe8f3d80304b3f8b22aaa8
  • Loading branch information...
1 parent 6e31da2 commit f794ef3c59cfb5dcc8d7049154d0b8b1fcb92105 @danielrobbins danielrobbins committed Jul 11, 2012
Showing 314 changed files with 2,698 additions and 1,542 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/eselect-php/eselect-php-0.6.7.ebuild,v 1.3 2012/07/10 06:55:28 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-php/eselect-php-0.6.7.ebuild,v 1.4 2012/07/11 00:36:28 blueness Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="http://dev.gentoo.org/~olemarkus/eselect-php/eselect-php-${PV}.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos"
IUSE=""
DEPEND=">=app-admin/eselect-1.2.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/atool/atool-0.39.0.ebuild,v 1.3 2012/07/09 11:51:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/atool/atool-0.39.0.ebuild,v 1.4 2012/07/10 17:47:55 ranger Exp $
EAPI="4"
@@ -10,7 +10,7 @@ SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
IUSE=""
DEPEND="dev-lang/perl"
@@ -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/gnupg/gnupg-2.0.19.ebuild,v 1.10 2012/06/29 14:27:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.19.ebuild,v 1.11 2012/07/10 18:51:51 ranger Exp $
EAPI="4"
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="adns bzip2 doc ldap nls readline static selinux smartcard usb"
COMMON_DEPEND_LIBS="
View
@@ -1,2 +1,3 @@
DIST gpgme-1.3.0.tar.bz2 869470 SHA256 74e040fcd46061f6b0d8b621a2a2a48100a7ba5c9f69e7cf207259a6e2e3e6a1 SHA512 b4ac2efa136ba56ca680fc0d8f055f88f7a5a4826baae5aed988d2e45937c51788d79e98f64d7c3c220c31912bad511ac2e491f566b2f8e39e3874ccffbcbf8b WHIRLPOOL d9856e0d582c522b734d3341aee50c7950008b14ff228519aa93c048b5b6aefb4d10b875a4575048fbc48f8be5c14af7af9569fd4cb9042e6da4e4b5f9c80073
DIST gpgme-1.3.1.tar.bz2 841093 SHA256 15ef27a875ae0d79d7446fd931deda11438e724ffbeac74449ed19cba23df4d4 SHA512 3e661e8c7c146c3e920efcbaf3fae93917af7dd387cecf3890c936b575a3c1f979c9da6f652e5caa81abd70fe923f2df303b8de8f0d06fa6825f8f482f83e1ca WHIRLPOOL 96ea59952161152353daac3e88acf7490f645cf2f3132f16fff29e3cff4082fc6fbc8d1d41a64b388d3ad517ddc6095ac00e6cfe797773b138066ca26f4487ae
+DIST gpgme-1.3.2.tar.bz2 867738 SHA256 cfd235663f1d1adc97abb38dd5e6d093bb7e155580f171f9ba0158feab69f875 SHA512 5452aa663a85f7853f8194746ee3f7a70f46af719490df240401b0b9d97b0e2d3656d73dd469f136dc4ba0f878f5ef445f43e682a049a3a99c3ac22de29d79c5 WHIRLPOOL 19761dbc7430065d83884cb371bdfb39a114414447c8503e4ee77b72ee5dd007b373aaba4d8f6414250fcdf6eb6a219316135c73d2addb058fc09825ab943dc4
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.3.2.ebuild,v 1.1 2012/07/10 23:58:20 radhermit Exp $
+
+EAPI="4"
+
+inherit eutils libtool autotools
+
+DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
+HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
+SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="common-lisp static-libs"
+
+DEPEND="app-crypt/gnupg
+ >=dev-libs/libassuan-2.0.2
+ >=dev-libs/libgpg-error-1.4"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.1.8-et_EE.patch
+
+ eautoreconf
+ elibtoolize
+}
+
+src_configure() {
+ econf \
+ --includedir="${EPREFIX}/usr/include/gpgme" \
+ --with-gpg="${EPREFIX}/usr/bin/gpg" \
+ --with-gpgsm="${EPREFIX}/usr/bin/gpgsm" \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ prune_libtool_files
+
+ if ! use common-lisp; then
+ rm -fr "${ED}usr/share/common-lisp"
+ 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-crypt/md5deep/md5deep-4.0.1.ebuild,v 1.4 2012/07/09 11:54:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/md5deep/md5deep-4.0.1.ebuild,v 1.5 2012/07/10 17:49:00 ranger Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="public-domain GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
DOCS="AUTHORS ChangeLog FILEFORMAT NEWS README TODO"
@@ -1,2 +1 @@
-DIST krb5-appl-1.0.2-signed.tar 634880 SHA256 ca82209ba11e37390a7b79b0eb27abac9526442d296d60b752a0a94969bbad7d SHA512 0e44f1eb731a829628f9c597f8357c859b2fe4de1654490725249db9c742a6cd67755c3e8f08b5139fc0c59e78d200def133188b265bc16d046e1b9412a6cb9e WHIRLPOOL bf15f5773d1e146b3d96ec36c97f35a346a50e3cc1540901a51aa0e4235d1d4e6d8c38ea50bb37a22471d32e11e1ac1a1907ee4c3b096544fbb143866019a791
DIST krb5-appl-1.0.3-signed.tar 634880 SHA256 feb88581eba566554ad515a6fcf18cee11e8409a2c4755bf5188db96f0b7f039 SHA512 1d85be6eb39a01c21308f6b159a375ae4ee331de8052c3990c9252f708d717b8b518f92c424bd6beebe344d940b4813e6ea11dd18df5d7caa4b5effc2513dd23 WHIRLPOOL 091525cd162375b383f41f0627fa3dba2468459e2aa8fdaf8fff6c01f2bfd27af45990fc68ec0a0eea13288e3288c967e55346c53165ea1238ddea9b94a94364
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.2-r1.ebuild,v 1.7 2012/01/08 15:58:41 armin76 Exp $
-
-EAPI=4
-
-inherit flag-o-matic versionator eutils
-
-MY_P=${P/mit-}
-MAJOR_MINOR="$( get_version_component_range 1-2 )"
-DESCRIPTION="Kerberized applications split from the main MIT Kerberos V distribution"
-HOMEPAGE="http://web.mit.edu/kerberos/www/"
-SRC_URI="http://web.mit.edu/kerberos/dist/krb5-appl/${MAJOR_MINOR}/${MY_P}-signed.tar"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-RDEPEND=">=app-crypt/mit-krb5-1.8.0
- sys-libs/e2fsprogs-libs
- sys-libs/ncurses"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
- unpack ${A}
- unpack ./"${MY_P}".tar.gz
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/CVE-2011-4862.patch
-}
-
-src_configure() {
- append-flags "-I/usr/include/et"
- append-flags -fno-strict-aliasing
- append-flags -fno-strict-overflow
- econf
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- for i in {telnetd,ftpd} ; do
- mv "${D}"/usr/share/man/man8/${i}.8 "${D}"/usr/share/man/man8/k${i}.8 \
- || die "mv failed (man)"
- mv "${D}"/usr/sbin/${i} "${D}"/usr/sbin/k${i} || die "mv failed"
- done
-
- for i in {rcp,rlogin,rsh,telnet,ftp} ; do
- mv "${D}"/usr/share/man/man1/${i}.1 "${D}"/usr/share/man/man1/k${i}.1 \
- || die "mv failed (man)"
- mv "${D}"/usr/bin/${i} "${D}"/usr/bin/k${i} || die "mv failed"
- done
-
- rm "${D}"/usr/share/man/man1/tmac.doc
- 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-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r3.ebuild,v 1.5 2012/07/03 20:22:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r3.ebuild,v 1.6 2012/07/10 17:59:29 ranger Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="games X"
PDEPEND="virtual/emacs"
@@ -25,6 +25,7 @@
devices to another machine over TCP</flag>
<flag name='vde'>Enable VDE-based networking</flag>
<flag name='vhost-net'>Enable accelerated networking using vhost-net, see http://www.linux-kvm.org/page/VhostNet</flag>
+ <flag name='virtfs'>Enable VirtFS support. See http://wiki.qemu.org/Documentation/9psetup</flag>
<flag name='xattr'>
Add support for getting and setting POSIX extended attributes, through
<pkg>sys-apps/attr</pkg>. Requisite for the virtfs backend.
@@ -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/qemu-kvm/qemu-kvm-1.1.0.ebuild,v 1.9 2012/07/10 10:46:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-1.1.0.ebuild,v 1.12 2012/07/11 01:58:02 cardoe Exp $
EAPI="4"
@@ -25,9 +25,9 @@ HOMEPAGE="http://www.linux-kvm.org"
LICENSE="GPL-2"
SLOT="0"
-IUSE="+aio alsa bluetooth brltty +curl debug doc fdt kernel_linux \
+IUSE="+aio alsa bluetooth brltty +caps +curl debug doc fdt kernel_linux \
kernel_FreeBSD ncurses opengl pulseaudio python rbd sasl sdl \
-smartcard spice static tci tls usbredir vde +vhost-net xattr xen xfs"
+smartcard spice static tci tls usbredir vde +vhost-net virtfs xattr xen xfs"
COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb xtensa xtensaeb"
@@ -51,8 +51,10 @@ done
REQUIRED_USE="static? ( !alsa !pulseaudio )
amd64? ( qemu_softmmu_targets_x86_64 )
- x86? ( qemu_softmmu_targets_x86_64 )"
+ x86? ( qemu_softmmu_targets_x86_64 )
+ virtfs? ( xattr )"
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
RDEPEND="
!app-emulation/kqemu
!app-emulation/qemu
@@ -69,6 +71,7 @@ RDEPEND="
alsa? ( >=media-libs/alsa-lib-1.0.13 )
bluetooth? ( net-wireless/bluez )
brltty? ( app-accessibility/brltty )
+ caps? ( sys-libs/libcap-ng )
curl? ( >=net-misc/curl-7.15.4 )
fdt? ( >=sys-apps/dtc-1.2.0 )
kernel_linux? ( >=sys-apps/util-linux-2.16.0 )
@@ -90,6 +93,7 @@ RDEPEND="
tls? ( net-libs/gnutls )
usbredir? ( sys-apps/usbredir )
vde? ( net-misc/vde )
+ virtfs? ( sys-libs/libcap )
xattr? ( sys-apps/attr )
xen? ( app-emulation/xen-tools )
xfs? ( sys-fs/xfsprogs )"
@@ -217,7 +221,14 @@ src_configure() {
conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
# Add support for static builds
- use static && conf_opts="${conf_opts} --static"
+ use static && conf_opts="${conf_opts} --static --disable-pie"
+
+ # We always want to attempt to build with PIE support as it results
+ # in a more secure binary. But it doesn't work with static or if
+ # the current GCC doesn't have PIE support.
+ if ! use static && gcc-specs-pie; then
+ conf_opts="${conf_opts} --enable-pie"
+ fi
# audio options
audio_opts="oss"
@@ -237,14 +248,14 @@ src_configure() {
--disable-strip \
--disable-werror \
--enable-guest-agent \
- --enable-pie \
--enable-vnc-jpeg \
--enable-vnc-png \
--enable-vnc-thread \
--python=python2 \
$(use_enable aio linux-aio) \
$(use_enable bluetooth bluez) \
$(use_enable brltty brlapi) \
+ $(use_enable caps cap-ng) \
$(use_enable curl) \
$(use_enable debug debug-info) \
$(use_enable debug debug-mon) \
@@ -268,8 +279,8 @@ src_configure() {
$(use_enable usbredir usb-redir) \
$(use_enable vde) \
$(use_enable vhost-net) \
+ $(use_enable virtfs) \
$(use_enable xattr attr) \
- $(use_enable xattr virtfs) \
$(use_enable xen) \
$(use_enable xfs xfsctl) \
--audio-drv-list="${audio_opts}" \
Oops, something went wrong.

0 comments on commit f794ef3

Please sign in to comment.