Permalink
Browse files

glorious funtoo updates

merged:

  funtoo-overlay: bfd6ad37909666be075c6669e41a547a1bdab797
  foo-overlay: 6352fff301381ac370472ff0c01274fa55ffc0bb
  bar-overlay: f1e9085ee695ff5b6ce57d430d6b224aaf4fa0a6
  flora: ebf9beca688009d19006bd9312d56cbae8033315
  mythtv: d5133545c1814f01e74fe9079ba83d3cd21140f4
  • Loading branch information...
1 parent 44aa15d commit f555e10437eb6b644d33fb518de6e6b0a46545f6 @danielrobbins danielrobbins committed Nov 4, 2012
Showing 476 changed files with 4,939 additions and 2,903 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/denyhosts/denyhosts-2.6-r6.ebuild,v 1.3 2012/11/03 23:18:07 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/denyhosts/denyhosts-2.6-r6.ebuild,v 1.4 2012/11/04 13:40:59 ago Exp $
EAPI=4
SUPPORT_PYTHON_ABIS="1"
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ~sparc ~x86"
IUSE=""
DEPEND=""
@@ -1 +1,2 @@
DIST elektra-0.7.1.tar.gz 1347524 SHA256 ff90ae274935eac9c9c5c85ca7e66049be46a31d9ef08bc59a59858a15284c8c SHA512 25ca25e95d1a20a79ba97b094dc9630fb791f6653c2bacec751cc51492202831b7d28ae0786081e6be91581245bda3f5b7e2f3b523f7faa6bfb1d97b3d209684 WHIRLPOOL e90e7c126f2467c8ae29e3cffd5d8a6bfa444dfd38edcc8809d49562825aff8ec6c826139da4a2aa09e38935ee63b48674431c7cc27e2a14d372b2b8270b170d
+DIST elektra-0.8.3.tar.gz 1092409 SHA256 48fab82a6b1e8f0038c43ae9ade4da25b697d0aa74e39b7b94056ab7febc4be1 SHA512 e298c0515515a3a59fe28e695fd347ce775465d95f95f8d08c54e0223baf24300ec7e876d35fd3a07f2348290fdc7f740557333b26e847d09b4c41df63a1d886 WHIRLPOOL 64673416e96cc0a8f3ffbfc3f88525de3bc1270b381d0642b59f0a4f9d49db5cb296bd10a2839bc2baea82f58dcb6416ada1031553d378cba858d8f94df2d3b9
@@ -1,19 +1,19 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/elektra-0.7.1.ebuild,v 1.6 2012/06/23 07:47:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/elektra-0.7.1-r2.ebuild,v 1.2 2012/11/04 12:01:55 xmw Exp $
EAPI=4
inherit autotools eutils
DESCRIPTION="universal and secure framework to store config parameters in a hierarchical key-value pair mechanism"
-HOMEPAGE="http://sourceforge.net/projects/elektra/"
+HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra"
SRC_URI="ftp://ftp.markus-raab.org/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="iconv static-libs test"
+IUSE="gcov iconv static-libs test"
RDEPEND="dev-libs/libxml2"
DEPEND="${RDEPEND}
@@ -47,7 +47,7 @@ src_configure() {
--disable-daemon \
--enable-cpp \
--disable-python \
- --enable-gcov \
+ $(use_enable gcov) \
$(use_enable iconv) \
$(use_enable static-libs static) \
--with-docdir=/usr/share/doc/${PF} \
@@ -57,6 +57,22 @@ src_configure() {
src_install() {
emake DESTDIR="${D}" install
+ local my_f=""
+ #avoid collision with kerberos (bug 403025)
+ for my_f in kdb kdbbackend.h kdbos.h kdbtools.h keyset kdb.h \
+ kdbloader.h kdbprivate.h key ; do
+ mv "${D}"/usr/include/{,elektra-}"${my_f}" || die
+ elog "/usr/include/${my_f} installed as elektra-${my_f}"
+ done
+ sed -e '/^#include/s:kdbos.h:elektra-kdbos.h:' \
+ -i "${D}"/usr/include/elektra-kdb.h || die
+
+ #avoid collision with allegro (bug 409305)
+ for my_f in $(find "${D}"/usr/share/man/man3 -name "key.3*") ; do
+ mv "${my_f}" "${my_f/key/elektra-key}" || die
+ elog "/usr/share/man/man3/$(basename "${my_f}") installed as $(basename "${my_f/key/elektra-key}")"
+ done
+
if ! use static-libs; then
find "${D}" -name "*.a" -delete || die
fi
@@ -0,0 +1,73 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/elektra-0.8.3.ebuild,v 1.2 2012/11/04 12:01:55 xmw Exp $
+
+EAPI=4
+
+inherit cmake-utils eutils
+
+DESCRIPTION="universal and secure framework to store config parameters in a hierarchical key-value pair mechanism"
+HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra"
+SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus doc examples iconv inifile simpleini static-libs syslog tcl test xml yajl"
+
+RDEPEND="dev-libs/libxml2"
+DEPEND="${RDEPEND}
+ sys-devel/libtool
+ doc? ( app-doc/doxygen )
+ iconv? ( virtual/libiconv )
+ test? ( dev-libs/libxml2[static-libs] )
+ yajl? ( <dev-libs/yajl-2 )"
+
+src_configure() {
+ local my_plugins="ccode;dump;error;fstab;glob;hexcode;hidden;hosts;network;ni;null;path;resolver;struct;success;template;timeofday;tracer;type;validation"
+
+ #fix QA issues with upstream patches
+ epatch "${FILESDIR}/${P}-introduce-attributes.patch"
+ epatch "${FILESDIR}/${P}-fix-yajl-if-user-config.patch"
+
+ #move doc files to correct location
+ sed -e "s/elektra-api/${PF}/" \
+ -i cmake/ElektraCache.cmake || die
+
+ use dbus && my_plugins+=";dbus"
+ use doc && my_plugins+=";doc"
+ use iconv && my_plugins+=";iconv"
+ use inifile && my_plugins+=";simpleini"
+ use syslog && my_plugins+=";syslog"
+ use tcl && my_plugins+=";tcl"
+ use xml && my_plugins+=";xmltool"
+ use yajl && my_plugins+=";yajl"
+
+ local mycmakeargs=(
+ "-DPLUGINS=${my_plugins}"
+ "-DLATEX_COMPILER=OFF"
+ $(cmake-utils_use doc BUILD_DOCUMENTATION)
+ $(cmake-utils_use examples BUILD_EXAMPLES)
+ $(cmake-utils_use static-libs BUILD_STATIC)
+ $(cmake-utils_use test BUILD_TESTING)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ dodoc doc/{AUTHORS,CHANGES,NEWS,README,todo/TODO}
+
+ if use doc ; then
+ rm -rf "${D}/usr/share/doc/${PF}/man" || die
+ pushd ${CMAKE_BUILD_DIR}/doc/man/man3
+ local my_f
+ for my_f in *.3 ; do
+ newman ${my_f} ${PN}-${my_f}
+ elog "installed /usr/share/man/man3/${my_f} as ${PN}-${my_f}"
+ done
+ popd
+ fi
+}
@@ -0,0 +1,31 @@
+--- a/src/plugins/yajl/yajl.c
++++ b/src/plugins/yajl/yajl.c
+@@ -23,6 +23,10 @@
+ ***************************************************************************/
+
+
++#ifndef HAVE_KDBCONFIG
++# include "kdbconfig.h"
++#endif
++
+ #include "yajl.h"
+
+ #include <kdberrors.h>
+@@ -340,7 +344,7 @@
+ KeySet *config= elektraPluginGetConfig(handle);
+
+ // ksClear (returned);
+- if (keyIsUser(parentKey))
++ if (!strncmp(keyName(parentKey), "user", 4))
+ {
+ const Key * lookup = ksLookupByName(config, "/user_path", 0);
+ if (!lookup)
+@@ -422,7 +426,7 @@
+ return 1; /* success */
+ }
+
+-int elektraYajlSet(Plugin *handle, KeySet *returned, Key *parentKey)
++int elektraYajlSet(Plugin *handle ELEKTRA_UNUSED, KeySet *returned, Key *parentKey)
+ {
+ yajl_gen_config conf = { 1, " " };
+ yajl_gen g = yajl_gen_alloc(&conf, NULL);
@@ -0,0 +1,27 @@
+--- a/src/include/CMakeLists.txt
++++ b/src/include/CMakeLists.txt
+@@ -22,6 +22,9 @@
+ check_include_file(time.h HAVE_TIME_H)
+ check_include_file(unistd.h HAVE_UNISTD_H)
+
++set (ELEKTRA_DEPRECATED "__attribute__ ((deprecated))")
++set (ELEKTRA_UNUSED "__attribute__ ((unused))")
++
+ configure_file (
+ "${CMAKE_CURRENT_SOURCE_DIR}/kdb.h"
+ "${CMAKE_CURRENT_BINARY_DIR}/kdb.h"
+--- a/src/include/kdbconfig.h
++++ b/src/include/kdbconfig.h
+@@ -30,6 +30,12 @@
+ * to search for user configuration. */
+ #define KDB_DB_HOME "@KDB_DB_HOME@"
+
++/** Declares a parameter as unused. */
++#define ELEKTRA_UNUSED @ELEKTRA_UNUSED@
++
++/** Declares an API as deprecated. */
++#define ELEKTRA_DEPRECATED @ELEKTRA_DEPRECATED@
++
+ /* disable debug output messages */
+ #define DEBUG @DEBUG@
+
@@ -5,5 +5,10 @@
<email>xmw@gentoo.org</email>
<name>Michael Weber</name>
</maintainer>
+<use>
+ <flag name="gcov">Enable coverage support</flag>
+ <flag name="simpleini">Enable simpleini support</flag>
+ <flag name="yajl">Enable yajl support</flag>
+</use>
</pkgmetadata>
@@ -0,0 +1 @@
+DIST eselect-timezone-0.1.tar.gz 1243 SHA256 3e660ede3d2ecec40dfb176530a2b9fd10b8636e2305dcafdf991a3ac01cc36a SHA512 57601d4d34533ba12c458860b753486cc474e31ce2c3e731ad5bf9179094a74e92f79f47c6928e92d70d6a7fa54c606100c334d74ce243564a0c9a1e72a43bfa WHIRLPOOL 484e0003a3b32bd6cd0562119c345185e6f2ae044c4acdd22a92dac62f39bd5951ea6986561a057f4e44128157b4c733004b49c81583ebfddeef88ab9acf9767
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-timezone/eselect-timezone-0.1.ebuild,v 1.1 2012/11/04 17:35:44 ottxor Exp $
+
+EAPI=4
+
+DESCRIPTION="Manages timezone selection"
+HOMEPAGE="http://www.gentoo.org"
+SRC_URI="http://dev.gentoo.org/~ottxor/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ doins timezone.eselect
+}
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>ottxor@gentoo.org</email>
+ <name>Christoph Junghans</name>
+ </maintainer>
+</pkgmetadata>
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/passook/passook-20121001.ebuild,v 1.2 2012/11/03 17:20:51 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/passook/passook-20121001.ebuild,v 1.3 2012/11/04 13:41:18 ago Exp $
EAPI=4
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ppc ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
RDEPEND="dev-lang/perl
sys-apps/miscfiles"
@@ -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/pbzip2/pbzip2-1.1.5.ebuild,v 1.9 2012/10/07 11:58:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-1.1.5.ebuild,v 1.10 2012/11/04 16:49:43 ulm Exp $
EAPI=4
@@ -10,7 +10,7 @@ DESCRIPTION="Parallel bzip2 (de)compressor using libbz2"
HOMEPAGE="http://compression.ca/pbzip2/"
SRC_URI="http://compression.ca/${PN}/${P}.tar.gz"
-LICENSE="PBZIP2"
+LICENSE="BZIP2"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
IUSE="static symlink"
@@ -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/pbzip2/pbzip2-1.1.6.ebuild,v 1.4 2012/10/07 11:58:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-1.1.6.ebuild,v 1.5 2012/11/04 16:49:43 ulm Exp $
EAPI=4
@@ -10,7 +10,7 @@ DESCRIPTION="Parallel bzip2 (de)compressor using libbz2"
HOMEPAGE="http://compression.ca/pbzip2/"
SRC_URI="http://compression.ca/${PN}/${P}.tar.gz"
-LICENSE="PBZIP2"
+LICENSE="BZIP2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="static symlink"
@@ -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/pbzip2/pbzip2-1.1.8.ebuild,v 1.9 2012/10/07 11:58:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-1.1.8.ebuild,v 1.10 2012/11/04 16:49:43 ulm Exp $
EAPI=4
@@ -10,7 +10,7 @@ DESCRIPTION="Parallel bzip2 (de)compressor using libbz2"
HOMEPAGE="http://compression.ca/pbzip2/"
SRC_URI="https://launchpad.net/pbzip2/${PV:0:3}/${PV}/+download/${P}.tar.gz"
-LICENSE="PBZIP2"
+LICENSE="BZIP2"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="static symlink"
@@ -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/i7z/i7z-0.27.2.ebuild,v 1.2 2012/10/31 07:04:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/i7z/i7z-0.27.2.ebuild,v 1.3 2012/11/04 14:09:56 ago Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="X"
RDEPEND="
@@ -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/sign/sign-1.0.7.ebuild,v 1.14 2012/10/10 14:08:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/sign/sign-1.0.7.ebuild,v 1.15 2012/11/04 16:53:14 ulm Exp $
EAPI=4
@@ -10,7 +10,7 @@ DESCRIPTION="File signing and signature verification utility"
HOMEPAGE="http://swapped.cc/sign/"
SRC_URI="http://swapped.cc/${PN}/files/${P}.tar.gz"
-LICENSE="as-is"
+LICENSE="BZIP2"
SLOT="0"
KEYWORDS="amd64 ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
@@ -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/dhex/dhex-0.68.ebuild,v 1.1 2012/09/15 10:01:29 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/dhex/dhex-0.68.ebuild,v 1.2 2012/11/04 13:38:57 ago Exp $
EAPI=4
@@ -14,7 +14,7 @@ SRC_URI="http://www.dettus.net/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
IUSE=""
DEPEND="sys-libs/ncurses"
@@ -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/ess/ess-12.09.ebuild,v 1.1 2012/09/29 09:39:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ess/ess-12.09.ebuild,v 1.2 2012/11/04 13:39:31 ago Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="http://ess.r-project.org/downloads/ess/${P}.tgz"
LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
DEPEND="app-text/texi2html
virtual/latex-base"
Oops, something went wrong.

0 comments on commit f555e10

Please sign in to comment.