Permalink
Browse files

glorious funtoo updates

merged:

  funtoo-overlay: 5522723794c8172e624acb57f7fcc8e0bba2b4cb
  foo-overlay: e258a2c560b99d0e05d6520058510503ec7206ca
  bar-overlay: f1e9085ee695ff5b6ce57d430d6b224aaf4fa0a6
  flora: 45e90c77a7948b61fd106780237b223952b1319e
  for-gentoo: 72a2153c4a186665bcbf53363b7cd9d1c81cdd83
  • Loading branch information...
1 parent 9268d74 commit 7ef5e145f61b05f9acc0e259085cca5d5e6d9928 @danielrobbins danielrobbins committed Feb 23, 2013
Showing 2,125 changed files with 6,610 additions and 5,159 deletions.
@@ -1 +1,2 @@
DIST sphinxbase-0.7.tar.gz 3291922 SHA256 389cb99a545f7d615a2b3bc3f7362a490ca45fc4dc440140ae1d2a41f87773ec SHA512 c5cc4e60a43fdaabce8b75c89eaa5e3dc4a0ef1f4fc253a20da8098eea7f13cf1e344ce42ae8a70f34bce20547fc2c88858fc3ab62ce8386fed666dfa43e1109 WHIRLPOOL b1a2238595b371ffe4c9b48d7ab0b604be2adc1b4e3cab3f9a17c3e9c587cdfa5bfcb33e5c8e0fc9bf282873f7ab4fb3ee03551b2063c1398e51eefa83a0e15a
+DIST sphinxbase-0.8.tar.gz 3313197 SHA256 55708944872bab1015b8ae07b379bf463764f469163a8fd114cbb16c5e486ca8 SHA512 fdb13c07e591e868c395d5f8209ec389fb9d5a93d99104a00cb82382e84d320091ae7e74d53225706331d4959ab5e248fa622582a148bfdb6ab5c38470d1963c WHIRLPOOL df050d547a263954574902ce08d966a184d428ea5ec700128fde2fee5d78f948a5920e2b92540f052e4a1d6ac208b388350d7ad66c0548ee945f99ceab0f0a0c
@@ -0,0 +1,85 @@
+ configure.in | 40 +++++++++++++++++++++-------------------
+ src/libsphinxbase/Makefile.am | 1 +
+ 2 files changed, 22 insertions(+), 19 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index e10629c..b5d6ea9 100644
+--- a/configure.in
++++ b/configure.in
+@@ -62,13 +62,15 @@ if test x$withval = xno; then
+ use_lapack=false
+ fi
+ ])
+-if test x$use_lapack = xtrue; then
+- AC_CHECK_LIB(lapack, sgesv_,,use_internal_lapack=true)
+- if test x$use_internal_lapack != xtrue; then
+- AC_CHECK_LIB(blas, sgemm_,,use_internal_lapack=true)
+- fi
++AS_IF([test "x$with_lapack" = "xyes"], [
++ PKG_CHECK_MODULES([LAPACK], [lapack],,
++ AC_CHECK_LIB(lapack, sgesv_,,use_internal_lapack=true))
++ AS_IF([test "x$use_internal_lapack" != "xtrue"], [
++ PKG_CHECK_MODULES([BLAS], [blas],,
++ AC_CHECK_LIB(blas, sgemm_,,use_internal_lapack=true))
++ ])
+ AC_DEFINE(WITH_LAPACK, [], [Enable matrix algebra with LAPACK])
+-fi
++])
+ AM_CONDITIONAL(LAPACK_LITE, test x$use_internal_lapack = xtrue)
+ AM_CONDITIONAL(USE_LAPACK, test x$use_lapack = xtrue)
+
+@@ -208,9 +210,15 @@ AM_PROG_LIBTOOL
+ dnl
+ dnl Check for Doxygen, and build dox if present
+ dnl
+-AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, yes, no)
++AC_ARG_ENABLE([doc],
++ AS_HELP_STRING([--enable-doc], [Build docs using doxygen]))
++AS_IF([test "x$enable_doc" = "xyes"], [
++ AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, yes, no)
++ AS_IF([test "x$HAVE_DOXYGEN" != "xyes"], [
++ AC_MSG_ERROR([--enable-doc given, but doxygen not found.]); exit 1
++ ])
++])
+ AM_CONDITIONAL(BUILD_DOXYGEN, test "x$HAVE_DOXYGEN" = "xyes")
+-
+ dnl
+ dnl Check for Python, and build python module if present
+ dnl
+@@ -260,19 +268,13 @@ fi
+ AM_CONDITIONAL(BUILD_CYTHON, test "x$HAVE_CYTHON" = "xyes")
+
+ dnl
+-dnl Check for pkgconfig
+-dnl
+-AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
+-
+-dnl
+ dnl Check for libsndfile
+ dnl
+-if test "x$HAVE_PKGCONFIG" = "xyes"; then
+- PKG_CHECK_MODULES(SNDFILE,sndfile,,true)
+- AC_CHECK_HEADERS([sndfile.h])
+- PKG_CHECK_MODULES(SAMPLERATE,samplerate,,true)
+- AC_CHECK_HEADERS([samplerate.h])
+-fi
++PKG_CHECK_MODULES(SNDFILE,sndfile,,true)
++AC_CHECK_HEADERS([sndfile.h])
++PKG_CHECK_MODULES(SAMPLERATE,samplerate,,true)
++AC_CHECK_HEADERS([samplerate.h])
++
+ AC_SUBST(SNDFILE_LIBS)
+ AC_SUBST(SNDFILE_CFLAGS)
+ AC_SUBST(SAMPLERATE_LIBS)
+diff --git a/src/libsphinxbase/Makefile.am b/src/libsphinxbase/Makefile.am
+index 52ee3e1..f4efd8a 100644
+--- a/src/libsphinxbase/Makefile.am
++++ b/src/libsphinxbase/Makefile.am
+@@ -8,6 +8,7 @@ libsphinxbase_la_SOURCES =
+ # This is API version 2, software release 1, which also supports API version 1
+ libsphinxbase_la_LDFLAGS = -version-info 2:1:1
+ libsphinxbase_la_LIBADD = $(LTLIBICONV) \
++ @LAPACK_LIBS@ \
+ util/libsphinxutil.la \
+ fe/libsphinxfe.la \
+ feat/libsphinxfeat.la \
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>accessibility</herd>
+ <herd>accessibility</herd>
</pkgmetadata>
@@ -0,0 +1,76 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/sphinxbase/sphinxbase-0.8.ebuild,v 1.2 2013/02/23 13:52:58 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+DISTUTILS_OPTIONAL=1
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils distutils-r1
+
+DESCRIPTION="Support library required by the Sphinx Speech Recognition Engine"
+HOMEPAGE="http://cmusphinx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cmusphinx/${P}.tar.gz"
+
+LICENSE="BSD-2 HPND MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc lapack python static-libs"
+
+# automagic dep on pulseaudio
+RDEPEND="
+ media-sound/pulseaudio
+ lapack? ( virtual/lapack )
+ python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+ doc? ( >=app-doc/doxygen-1.4.7 )"
+
+# Due to generated Python setup.py.
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+PATCHES=( "${FILESDIR}"/${P}-unbundle-lapack.patch )
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with lapack)
+ $(use_enable doc)
+ # python modules are built through distutils
+ # so disable the ugly wrapper
+ --without-python
+ )
+ autotools-utils_src_configure
+}
+
+run_distutils() {
+ if use python; then
+ pushd python > /dev/null || die
+ distutils-r1_"${@}"
+ popd > /dev/null || die
+ fi
+}
+
+src_compile() {
+ autotools-utils_src_compile
+
+ run_distutils ${FUNCNAME}
+}
+
+python_test() {
+ LD_LIBRARY_PATH="${S}"/src/lib${PN}/.libs \
+ "${PYTHON}" sb_test.py || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+ autotools-utils_src_test
+
+ run_distutils ${FUNCNAME}
+}
+
+src_install() {
+ run_distutils ${FUNCNAME}
+
+ use doc && local HTML_DOCS=( doc/html/. )
+ autotools-utils_src_install
+}
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/star/star-1.5.2.ebuild,v 1.1 2013/02/04 11:45:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/star/star-1.5.2.ebuild,v 1.2 2013/02/23 17:55:55 jer Exp $
EAPI=5
@@ -58,7 +58,13 @@ src_prepare() {
src_configure() { :; } #avoid ./configure run
src_compile() {
- emake CC="$(tc-getCC)" COPTX="${CFLAGS}" CPPOPTX="${CPPFLAGS}" LDOPTX="${LDFLAGS}"
+ emake \
+ CC="$(tc-getCC)" \
+ COPTX="${CFLAGS}" \
+ CPPOPTX="${CPPFLAGS}" \
+ COPTGPROF= \
+ COPTOPT= \
+ LDOPTX="${LDFLAGS}"
}
src_install() {
@@ -0,0 +1,34 @@
+diff -ur xen-4.2.0.orig/xen/arch/x86/Makefile xen-4.2.0/xen/arch/x86/Makefile
+--- xen/arch/x86/Makefile 2012-09-17 18:21:19.000000000 +0800
++++ xen/arch/x86/Makefile 2013-02-23 20:37:30.679918815 +0800
+@@ -112,7 +112,7 @@
+ $(@D)/.$(@F).1.o -o $@
+ rm -f $(@D)/.$(@F).[0-9]*
+
+-EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10
++EFI_LDFLAGS = -mi386pep $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10
+ EFI_LDFLAGS += --image-base=$(1) --stack=0,0 --heap=0,0 --strip-debug
+ EFI_LDFLAGS += --section-alignment=0x200000 --file-alignment=0x20
+ EFI_LDFLAGS += --major-image-version=$(XEN_VERSION)
+diff -ur xen-4.2.0.orig/xen/Makefile xen-4.2.0/xen/Makefile
+--- xen/Makefile 2012-09-17 18:21:19.000000000 +0800
++++ xen/Makefile 2013-02-23 21:26:41.396771995 +0800
+@@ -12,7 +12,7 @@
+ export BASEDIR := $(CURDIR)
+ export XEN_ROOT := $(BASEDIR)/..
+
+-EFI_MOUNTPOINT ?= /boot/efi
++export EFI_MOUNTPOINT = /boot/efi
+
+ .PHONY: default
+ default: build
+@@ -43,6 +43,8 @@
+ ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi $(DESTDIR)$(EFI_DIR)/$(notdir $(TARGET)).efi; \
+ if [ -n '$(EFI_MOUNTPOINT)' -a -n '$(EFI_VENDOR)' ]; then \
+ $(INSTALL_DATA) $(TARGET).efi $(DESTDIR)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(notdir $(TARGET))-$(XEN_FULLVERSION).efi; \
++ elif [ -n '$(EFI_MOUNTPOINT)' ]; then \
++ $(INSTALL_DATA) $(TARGET).efi $(DESTDIR)$(EFI_MOUNTPOINT)/$(notdir $(TARGET))-$(XEN_FULLVERSION).efi; \
+ elif [ "$(DESTDIR)" = "$(patsubst $(shell cd $(XEN_ROOT) && pwd)/%,%,$(DESTDIR))" ]; then \
+ echo 'EFI installation only partially done (EFI_VENDOR not set)' >&2; \
+ fi; \
+
@@ -10,5 +10,6 @@
<flag name='flask'>Enable the Flask XSM module from NSA</flag>
<flag name='pae'>Enable support for PAE kernels (usually x86-32 with >4GB memory)</flag>
<flag name='xsm'>Enable the Xen Security Modules (XSM)</flag>
+ <flag name='efi'>Adds efi boot support, requires LDFLAG -melf_x86_64 for amd64</flag>
</use>
</pkgmetadata>
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.0-r1.ebuild,v 1.6 2013/02/04 15:43:23 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.0-r1.ebuild,v 1.7 2013/02/23 16:34:06 idella4 Exp $
EAPI=5
@@ -24,9 +24,10 @@ HOMEPAGE="http://xen.org/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="custom-cflags debug flask pae xsm"
+IUSE="custom-cflags debug efi flask pae xsm"
-RDEPEND=""
+RDEPEND="efi? ( >=sys-devel/binutils-2.22[multitarget] )
+ >=sys-devel/binutils-2.22[-multitarget]"
PDEPEND="~app-emulation/xen-tools-${PV}[${PYTHON_USEDEP}]"
RESTRICT="test"
@@ -39,6 +40,7 @@ REQUIRED_USE="
"
pkg_setup() {
python-single-r1_pkg_setup
+
if [[ -z ${XEN_TARGET_ARCH} ]]; then
if use x86 && use amd64; then
die "Confusion! Both x86 and amd64 are set in your use flags!"
@@ -63,6 +65,8 @@ src_prepare() {
# Drop .config, fix gcc-4.6
epatch "${FILESDIR}"/${PN}-4-fix_dotconfig-gcc.patch
+ use efi && epatch "${FILESDIR}"/${PN}-4-efi.patch
+
# if the user *really* wants to use their own custom-cflags, let them
if use custom-cflags; then
einfo "User wants their own CFLAGS - removing defaults"
@@ -108,24 +112,23 @@ src_configure() {
src_compile() {
# Send raw LDFLAGS so that --as-needed works
- emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+ emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
}
src_install() {
local myopt
use debug && myopt="${myopt} debug=y"
use pae && myopt="${myopt} pae=y"
+ use efi && mkdir -p "${D}"/boot/efi
- emake LDFLAGS="$(raw-ldflags)" DESTDIR="${ED}" -C xen ${myopt} install
+ emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
}
pkg_postinst() {
elog "Official Xen Guide and the unoffical wiki page:"
elog " http://www.gentoo.org/doc/en/xen-guide.xml"
elog " http://en.gentoo-wiki.com/wiki/Xen/"
- if use pae; then
- echo
- ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
- fi
+ use pae && ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
+ use efi && einfo "The efi executable is installed in boot/efi"
}
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.1-r1.ebuild,v 1.2 2013/01/31 15:43:53 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.1-r1.ebuild,v 1.3 2013/02/23 16:34:06 idella4 Exp $
EAPI=5
@@ -24,9 +24,10 @@ HOMEPAGE="http://xen.org/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="custom-cflags debug flask pae xsm"
+IUSE="custom-cflags debug efi flask pae xsm"
-RDEPEND=""
+RDEPEND="efi? ( >=sys-devel/binutils-2.22[multitarget] )
+ >=sys-devel/binutils-2.22[-multitarget]"
PDEPEND="~app-emulation/xen-tools-${PV}"
RESTRICT="test"
@@ -64,6 +65,8 @@ src_prepare() {
# Drop .config and fix gcc-4.6
epatch "${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch
+ use efi && epatch "${FILESDIR}"/${PN}-4-efi.patch
+
# if the user *really* wants to use their own custom-cflags, let them
if use custom-cflags; then
einfo "User wants their own CFLAGS - removing defaults"
@@ -107,6 +110,7 @@ src_install() {
local myopt
use debug && myopt="${myopt} debug=y"
use pae && myopt="${myopt} pae=y"
+ use efi && mkdir -p "${D}"/boot/efi
emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
}
@@ -116,8 +120,6 @@ pkg_postinst() {
elog " http://www.gentoo.org/doc/en/xen-guide.xml"
elog " http://en.gentoo-wiki.com/wiki/Xen/"
- if use pae; then
- echo
- ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
- fi
+ use pae && ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
+ use efi && einfo "The efi executable is installed in boot/efi"
}
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.9.0-r2.ebuild,v 1.7 2012/11/30 13:56:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.9.0-r2.ebuild,v 1.8 2013/02/23 15:50:10 ago Exp $
EAPI=4
@@ -19,7 +19,7 @@ fi
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
IUSE="debug doc hardware-carrier transmitter static-libs X"
S="${WORKDIR}/${MY_P}"
@@ -1,12 +1,12 @@
# Copyright 1999-2013 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-r2.ebuild,v 1.8 2013/01/29 17:11:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.7.7-r2.ebuild,v 1.9 2013/02/23 15:50:26 ago Exp $
EAPI=5
if [[ "${PV}" != "9999" ]]; then
SRC_URI="http://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
- KEYWORDS="amd64 ~arm ppc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
else
EGIT_REPO_URI="git://anongit.kde.org/strigi"
GIT_ECLASS="git-2"
Oops, something went wrong.

0 comments on commit 7ef5e14

Please sign in to comment.