"${LDFLAGS}" ;
+${mpi_configuration}
+${python_configuration}
+__EOF__
+}
+
+pkg_pretend() {
+ if use test; then
+ CHECKREQS_DISK_BUILD="15G" check-reqs_pkg_pretend
+
+ ewarn "The tests may take several hours on a recent machine"
+ ewarn "but they will not fail (unless something weird happens ;-)"
+ ewarn "This is because the tests depend on the used compiler version"
+ ewarn "and the platform and upstream says that this is normal."
+ ewarn "If you are interested in the results, please take a look at the"
+ ewarn "generated results page:"
+ ewarn " ${ROOT}usr/share/doc/${PF}/status/cs-$(uname).html"
+ fi
+}
+
+pkg_setup() {
+ if use python; then
+ python_pkg_setup
+ fi
+
+ if use debug; then
+ ewarn "The debug USE flag means that a second set of the boost libraries"
+ ewarn "will be built containing debug symbols. You'll be able to select them"
+ ewarn "using the boost-eselect module. But even though the optimization flags"
+ ewarn "you might have set are not stripped, there will be a performance"
+ ewarn "penalty and linking other packages against the debug version"
+ ewarn "of boost is _not_ recommended."
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-1.48.0-mpi_python3.patch"
+ epatch "${FILESDIR}/${PN}-1.48.0-respect_python-buildid.patch"
+ epatch "${FILESDIR}/${PN}-1.48.0-support_dots_in_python-buildid.patch"
+ epatch "${FILESDIR}/${PN}-1.48.0-no_strict_aliasing_python2.patch"
+ epatch "${FILESDIR}/${PN}-1.48.0-disable_libboost_python3.patch"
+ epatch "${FILESDIR}/${PN}-1.48.0-python_linking.patch"
+ epatch "${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch"
+ epatch "${FILESDIR}/remove-toolset-1.48.0.patch"
+}
+
+src_configure() {
+ OPTIONS=""
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ # We need to add the prefix, and in two cases this exceeds, so prepare
+ # for the largest possible space allocation.
+ append-ldflags -Wl,-headerpad_max_install_names
+ fi
+
+ # bug 298489
+ if use ppc || use ppc64; then
+ [[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec
+ fi
+
+ use icu && OPTIONS+=" -sICU_PATH=/usr"
+ use icu || OPTIONS+=" --disable-icu boost.locale.icu=off"
+ use mpi || OPTIONS+=" --without-mpi"
+ use python || OPTIONS+=" --without-python"
+
+ # https://svn.boost.org/trac/boost/attachment/ticket/2597/add-disable-long-double.patch
+ if use sparc || { use mips && [[ ${ABI} = "o32" ]]; } || use hppa || use arm || use x86-fbsd || use sh; then
+ OPTIONS+=" --disable-long-double"
+ fi
+
+ OPTIONS+=" pch=off --boost-build=/usr/share/boost-build-${MAJOR_PV} --prefix=\"${D}usr\" --layout=versioned"
+
+ if use static-libs; then
+ LINK_OPTS="link=shared,static"
+ LIBRARY_TARGETS="*.a *$(get_libname)"
+ else
+ LINK_OPTS="link=shared"
+ # There is no dynamically linked version of libboost_test_exec_monitor and libboost_exception.
+ LIBRARY_TARGETS="libboost_test_exec_monitor*.a libboost_exception*.a *$(get_libname)"
+ fi
+}
+
+src_compile() {
+ local jobs
+ jobs=$( echo " ${MAKEOPTS} " | \
+ sed -e 's/ --jobs[= ]/ -j /g' \
+ -e 's/ -j \([1-9][0-9]*\)/ -j\1/g' \
+ -e 's/ -j\>/ -j1/g' | \
+ ( while read -d ' ' j; do if [[ "${j#-j}" = "$j" ]]; then continue; fi; jobs="${j#-j}"; done; echo ${jobs} ) )
+ if [[ "${jobs}" != "" ]]; then NUMJOBS="-j"${jobs}; fi
+
+ export BOOST_ROOT="${S}"
+ PYTHON_DIRS=""
+ MPI_PYTHON_MODULE=""
+
+ building() {
+ create_user-config.jam
+
+ einfo "Using the following command to build:"
+ einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoorelease --user-config=user-config.jam ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared $(use python && echo --python-buildid=${PYTHON_ABI})"
+
+ ${BJAM} ${NUMJOBS} -q -d+2 \
+ gentoorelease \
+ --user-config=user-config.jam \
+ ${OPTIONS} \
+ threading=single,multi ${LINK_OPTS} runtime-link=shared \
+ $(use python && echo --python-buildid=${PYTHON_ABI}) \
+ || die "Building of Boost libraries failed"
+
+ # ... and do the whole thing one more time to get the debug libs
+ if use debug; then
+ einfo "Using the following command to build:"
+ einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoodebug --user-config=user-config.jam ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared --buildid=debug $(use python && echo --python-buildid=${PYTHON_ABI})"
+
+ ${BJAM} ${NUMJOBS} -q -d+2 \
+ gentoodebug \
+ --user-config=user-config.jam \
+ ${OPTIONS} \
+ threading=single,multi ${LINK_OPTS} runtime-link=shared \
+ --buildid=debug \
+ $(use python && echo --python-buildid=${PYTHON_ABI}) \
+ || die "Building of Boost debug libraries failed"
+ fi
+
+ if use python; then
+ if [[ -z "${PYTHON_DIRS}" ]]; then
+ PYTHON_DIRS="$(find bin.v2/libs -name python | sort)"
+ else
+ if [[ "${PYTHON_DIRS}" != "$(find bin.v2/libs -name python | sort)" ]]; then
+ die "Inconsistent structure of build directories"
+ fi
+ fi
+
+ local dir
+ for dir in ${PYTHON_DIRS}; do
+ mv ${dir} ${dir}-${PYTHON_ABI} || die "Renaming of '${dir}' to '${dir}-${PYTHON_ABI}' failed"
+ done
+
+ if use mpi; then
+ if [[ -z "${MPI_PYTHON_MODULE}" ]]; then
+ MPI_PYTHON_MODULE="$(find bin.v2/libs/mpi/build/*/gentoorelease -name mpi.so)"
+ if [[ "$(echo "${MPI_PYTHON_MODULE}" | wc -l)" -ne 1 ]]; then
+ die "Multiple mpi.so files found"
+ fi
+ else
+ if [[ "${MPI_PYTHON_MODULE}" != "$(find bin.v2/libs/mpi/build/*/gentoorelease -name mpi.so)" ]]; then
+ die "Inconsistent structure of build directories"
+ fi
+ fi
+
+ mv stage/lib/mpi.so stage/lib/mpi.so-${PYTHON_ABI} || die "Renaming of 'stage/lib/mpi.so' to 'stage/lib/mpi.so-${PYTHON_ABI}' failed"
+ fi
+ fi
+ }
+ if use python; then
+ python_execute_function building
+ else
+ building
+ fi
+
+ if use tools; then
+ pushd tools > /dev/null || die
+ einfo "Using the following command to build the tools:"
+ einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoorelease --user-config=../user-config.jam ${OPTIONS}"
+
+ ${BJAM} ${NUMJOBS} -q -d+2\
+ gentoorelease \
+ --user-config=../user-config.jam \
+ ${OPTIONS} \
+ || die "Building of Boost tools failed"
+ popd > /dev/null || die
+ fi
+}
+
+src_install () {
+ dodir /usr/share/boost-eselect/profiles/${SLOT}
+ touch "${D}usr/share/boost-eselect/profiles/${SLOT}/default" || die
+ if use debug; then
+ touch "${D}usr/share/boost-eselect/profiles/${SLOT}/debug" || die
+ fi
+
+ if use mpi && use python; then
+ _add_line "python_modules=\""
+ fi
+
+ installation() {
+ create_user-config.jam
+
+ if use python; then
+ local dir
+ for dir in ${PYTHON_DIRS}; do
+ cp -pr ${dir}-${PYTHON_ABI} ${dir} || die "Copying of '${dir}-${PYTHON_ABI}' to '${dir}' failed"
+ done
+
+ if use mpi; then
+ cp -p stage/lib/mpi.so-${PYTHON_ABI} "${MPI_PYTHON_MODULE}" || die "Copying of 'stage/lib/mpi.so-${PYTHON_ABI}' to '${MPI_PYTHON_MODULE}' failed"
+ cp -p stage/lib/mpi.so-${PYTHON_ABI} stage/lib/mpi.so || die "Copying of 'stage/lib/mpi.so-${PYTHON_ABI}' to 'stage/lib/mpi.so' failed"
+ fi
+ fi
+
+ einfo "Using the following command to install:"
+ einfo "${BJAM} -q -d+2 gentoorelease --user-config=user-config.jam ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared --includedir=\"${D}usr/include\" --libdir=\"${D}usr/$(get_libdir)\" $(use python && echo --python-buildid=${PYTHON_ABI}) install"
+
+ ${BJAM} -q -d+2 \
+ gentoorelease \
+ --user-config=user-config.jam \
+ ${OPTIONS} \
+ threading=single,multi ${LINK_OPTS} runtime-link=shared \
+ --includedir="${D}usr/include" \
+ --libdir="${D}usr/$(get_libdir)" \
+ $(use python && echo --python-buildid=${PYTHON_ABI}) \
+ install || die "Installation of Boost libraries failed"
+
+ if use debug; then
+ einfo "Using the following command to install:"
+ einfo "${BJAM} -q -d+2 gentoodebug --user-config=user-config.jam ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared --includedir=\"${D}usr/include\" --libdir=\"${D}usr/$(get_libdir)\" --buildid=debug $(use python && echo --python-buildid=${PYTHON_ABI})"
+
+ ${BJAM} -q -d+2 \
+ gentoodebug \
+ --user-config=user-config.jam \
+ ${OPTIONS} \
+ threading=single,multi ${LINK_OPTS} runtime-link=shared \
+ --includedir="${D}usr/include" \
+ --libdir="${D}usr/$(get_libdir)" \
+ --buildid=debug \
+ $(use python && echo --python-buildid=${PYTHON_ABI}) \
+ install || die "Installation of Boost debug libraries failed"
+ fi
+
+ if use python; then
+ rm -r ${PYTHON_DIRS} || die
+
+ # Move mpi.so Python module to Python site-packages directory and make sure it is slotted.
+ if use mpi; then
+ mkdir -p "${D}$(python_get_sitedir)/boost_${MAJOR_PV}" || die
+ mv "${D}usr/$(get_libdir)/mpi.so" "${D}$(python_get_sitedir)/boost_${MAJOR_PV}" || die
+ cat << EOF > "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/__init__.py" || die
+import sys
+if sys.platform.startswith('linux'):
+ import DLFCN
+ flags = sys.getdlopenflags()
+ sys.setdlopenflags(DLFCN.RTLD_NOW | DLFCN.RTLD_GLOBAL)
+ from . import mpi
+ sys.setdlopenflags(flags)
+ del DLFCN, flags
+else:
+ from . import mpi
+del sys
+EOF
+ _add_line "$(python_get_sitedir)/mpi.py:boost_${MAJOR_PV}.mpi"
+ fi
+ fi
+ }
+ if use python; then
+ python_execute_function installation
+ else
+ installation
+ fi
+
+ if use mpi && use python; then
+ _add_line "\""
+ fi
+
+ use python || rm -rf "${D}usr/include/boost-${MAJOR_PV}/boost"/python* || die
+
+ if use doc; then
+ find libs/*/* -iname "test" -or -iname "src" | xargs rm -rf
+ dohtml \
+ -A pdf,txt,cpp,hpp \
+ *.{htm,html,png,css} \
+ -r doc
+ dohtml \
+ -A pdf,txt \
+ -r tools
+ insinto /usr/share/doc/${PF}/html
+ doins -r libs
+ doins -r more
+
+ # To avoid broken links
+ insinto /usr/share/doc/${PF}/html
+ doins LICENSE_1_0.txt
+
+ dosym /usr/include/boost-${MAJOR_PV}/boost /usr/share/doc/${PF}/html/boost
+ fi
+
+ pushd "${D}usr/$(get_libdir)" > /dev/null || die
+
+ # Remove (unversioned) symlinks
+ # And check for what we remove to catch bugs
+ # got a better idea how to do it? tell me!
+ local f
+ for f in $(ls -1 ${LIBRARY_TARGETS} | grep -v "${MAJOR_PV}"); do
+ if [[ ! -h "${f}" ]]; then
+ eerror "Tried to remove '${f}' which is a regular file instead of a symlink"
+ die "Slotting/naming of the libraries broken!"
+ fi
+ rm "${f}" || die
+ done
+
+ # The threading libs obviously always gets the "-mt" (multithreading) tag
+ # some packages seem to have a problem with it. Creating symlinks...
+
+ if use static-libs; then
+ THREAD_LIBS="libboost_thread-mt-${MAJOR_PV}.a libboost_thread-mt-${MAJOR_PV}$(get_libname)"
+ else
+ THREAD_LIBS="libboost_thread-mt-${MAJOR_PV}$(get_libname)"
+ fi
+ local lib
+ for lib in ${THREAD_LIBS}; do
+ dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
+ done
+
+ # The same goes for the mpi libs
+ if use mpi; then
+ if use static-libs; then
+ MPI_LIBS="libboost_mpi-mt-${MAJOR_PV}.a libboost_mpi-mt-${MAJOR_PV}$(get_libname)"
+ else
+ MPI_LIBS="libboost_mpi-mt-${MAJOR_PV}$(get_libname)"
+ fi
+ local lib
+ for lib in ${MPI_LIBS}; do
+ dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
+ done
+ fi
+
+ if use debug; then
+ if use static-libs; then
+ THREAD_DEBUG_LIBS="libboost_thread-mt-${MAJOR_PV}-debug$(get_libname) libboost_thread-mt-${MAJOR_PV}-debug.a"
+ else
+ THREAD_DEBUG_LIBS="libboost_thread-mt-${MAJOR_PV}-debug$(get_libname)"
+ fi
+
+ local lib
+ for lib in ${THREAD_DEBUG_LIBS}; do
+ dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
+ done
+
+ if use mpi; then
+ if use static-libs; then
+ MPI_DEBUG_LIBS="libboost_mpi-mt-${MAJOR_PV}-debug.a libboost_mpi-mt-${MAJOR_PV}-debug$(get_libname)"
+ else
+ MPI_DEBUG_LIBS="libboost_mpi-mt-${MAJOR_PV}-debug$(get_libname)"
+ fi
+
+ local lib
+ for lib in ${MPI_DEBUG_LIBS}; do
+ dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
+ done
+ fi
+ fi
+
+ # Create a subdirectory with completely unversioned symlinks
+ # and store the names in the profiles-file for eselect
+ dodir /usr/$(get_libdir)/boost-${MAJOR_PV}
+
+ _add_line "libs=\"" default
+ local f
+ for f in $(ls -1 ${LIBRARY_TARGETS} | grep -v debug); do
+ dosym ../${f} /usr/$(get_libdir)/boost-${MAJOR_PV}/${f/-${MAJOR_PV}}
+ _add_line "/usr/$(get_libdir)/${f}" default
+ done
+ _add_line "\"" default
+
+ if use debug; then
+ _add_line "libs=\"" debug
+ dodir /usr/$(get_libdir)/boost-${MAJOR_PV}-debug
+ local f
+ for f in $(ls -1 ${LIBRARY_TARGETS} | grep debug); do
+ dosym ../${f} /usr/$(get_libdir)/boost-${MAJOR_PV}-debug/${f/-${MAJOR_PV}-debug}
+ _add_line "/usr/$(get_libdir)/${f}" debug
+ done
+ _add_line "\"" debug
+
+ _add_line "includes=\"/usr/include/boost-${MAJOR_PV}/boost\"" debug
+ _add_line "suffix=\"-debug\"" debug
+ fi
+
+ _add_line "includes=\"/usr/include/boost-${MAJOR_PV}/boost\"" default
+
+ popd > /dev/null || die
+
+ if use tools; then
+ pushd dist/bin > /dev/null || die
+ # Append version postfix to binaries for slotting
+ _add_line "bins=\""
+ local b
+ for b in *; do
+ newbin "${b}" "${b}-${MAJOR_PV}"
+ _add_line "/usr/bin/${b}-${MAJOR_PV}"
+ done
+ _add_line "\""
+ popd > /dev/null || die
+
+ pushd dist > /dev/null || die
+ insinto /usr/share
+ doins -r share/boostbook
+ # Append version postfix for slotting
+ mv "${D}usr/share/boostbook" "${D}usr/share/boostbook-${MAJOR_PV}" || die
+ _add_line "dirs=\"/usr/share/boostbook-${MAJOR_PV}\""
+ popd > /dev/null || die
+ fi
+
+ pushd status > /dev/null || die
+ if [[ -f regress.log ]]; then
+ docinto status
+ dohtml *.html ../boost.png
+ dodoc regress.log
+ fi
+ popd > /dev/null || die
+
+ # boost's build system truely sucks for not having a destdir. Because for
+ # this reason we are forced to build with a prefix that includes the
+ # DESTROOT, dynamic libraries on Darwin end messed up, referencing the
+ # DESTROOT instread of the actual EPREFIX. There is no way out of here
+ # but to do it the dirty way of manually setting the right install_names.
+ if [[ ${CHOST} == *-darwin* ]]; then
+ einfo "Working around completely broken build-system(tm)"
+ local d
+ for d in "${ED}"usr/lib/*.dylib; do
+ if [[ -f ${d} ]]; then
+ # fix the "soname"
+ ebegin " correcting install_name of ${d#${ED}}"
+ install_name_tool -id "/${d#${D}}" "${d}"
+ eend $?
+ # fix references to other libs
+ refs=$(otool -XL "${d}" | \
+ sed -e '1d' -e 's/^\t//' | \
+ grep "^libboost_" | \
+ cut -f1 -d' ')
+ local r
+ for r in ${refs}; do
+ ebegin " correcting reference to ${r}"
+ install_name_tool -change \
+ "${r}" \
+ "${EPREFIX}/usr/lib/${r}" \
+ "${d}"
+ eend $?
+ done
+ fi
+ done
+ fi
+}
+
+src_test() {
+ testing() {
+ if use python; then
+ local dir
+ for dir in ${PYTHON_DIRS}; do
+ cp -pr ${dir}-${PYTHON_ABI} ${dir} || die "Copying of '${dir}-${PYTHON_ABI}' to '${dir}' failed"
+ done
+
+ if use mpi; then
+ cp -p stage/lib/mpi.so-${PYTHON_ABI} "${MPI_PYTHON_MODULE}" || die "Copying of 'stage/lib/mpi.so-${PYTHON_ABI}' to '${MPI_PYTHON_MODULE}' failed"
+ cp -p stage/lib/mpi.so-${PYTHON_ABI} stage/lib/mpi.so || die "Copying of 'stage/lib/mpi.so-${PYTHON_ABI}' to 'stage/lib/mpi.so' failed"
+ fi
+ fi
+
+ pushd tools/regression/build > /dev/null || die
+ einfo "Using the following command to build test helpers:"
+ einfo "${BJAM} -q -d+2 gentoorelease --user-config=../../../user-config.jam ${OPTIONS} process_jam_log compiler_status"
+
+ ${BJAM} -q -d+2 \
+ gentoorelease \
+ --user-config=../../../user-config.jam \
+ ${OPTIONS} \
+ process_jam_log compiler_status \
+ || die "Building of regression test helpers failed"
+
+ popd > /dev/null || die
+ pushd status > /dev/null || die
+
+ # Some of the test-checks seem to rely on regexps
+ export LC_ALL="C"
+
+ # The following is largely taken from tools/regression/run_tests.sh,
+ # but adapted to our needs.
+
+ # Run the tests & write them into a file for postprocessing
+ einfo "Using the following command to test:"
+ einfo "${BJAM} --user-config=../user-config.jam ${OPTIONS} --dump-tests"
+
+ ${BJAM} \
+ --user-config=../user-config.jam \
+ ${OPTIONS} \
+ --dump-tests 2>&1 | tee regress.log || die
+
+ # Postprocessing
+ cat regress.log | "$(find ../tools/regression/build/bin/gcc-$(gcc-version)/gentoorelease -name process_jam_log)" --v2
+ if test $? != 0; then
+ die "Postprocessing the build log failed"
+ fi
+
+ cat > comment.html <<- __EOF__
+ Tests are run on a Gentoo system.
+__EOF__
+
+ # Generate the build log html summary page
+ "$(find ../tools/regression/build/bin/gcc-$(gcc-version)/gentoorelease -name compiler_status)" --v2 \
+ --comment comment.html "${S}" \
+ cs-$(uname).html cs-$(uname)-links.html
+ if test $? != 0; then
+ die "Generating the build log html summary page failed"
+ fi
+
+ # And do some cosmetic fixes :)
+ sed -i -e 's|http://www.boost.org/boost.png|boost.png|' *.html || die
+
+ popd > /dev/null || die
+
+ if use python; then
+ rm -r ${PYTHON_DIRS} || die
+ fi
+ }
+ if use python; then
+ python_execute_function -f -q testing
+ else
+ testing
+ fi
+}
+
+pkg_postinst() {
+ if use eselect; then
+ eselect boost update || ewarn "eselect boost update failed."
+ fi
+
+ if [[ ! -h "${ROOT}etc/eselect/boost/active" ]]; then
+ elog "No active boost version found. Calling eselect to select one..."
+ eselect boost update || ewarn "eselect boost update failed."
+ fi
+}
diff --git a/dev-libs/boost/metadata.xml b/dev-libs/boost/metadata.xml
index 92c1f4ec6b4d..e3ae40ca1e95 100644
--- a/dev-libs/boost/metadata.xml
+++ b/dev-libs/boost/metadata.xml
@@ -14,6 +14,10 @@
hwoarang@gentoo.org
Markos Chandras
+
+ arfrever.fta@gmail.com
+ Arfrever Frehtes Taifersar Arahesis
+
Boost is a free peer-reviewed portable C++ source libraries.
diff --git a/dev-libs/dmalloc/dmalloc-5.5.2-r4.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r4.ebuild
index c40eb642d2e8..f032f151077a 100644
--- a/dev-libs/dmalloc/dmalloc-5.5.2-r4.ebuild
+++ b/dev-libs/dmalloc/dmalloc-5.5.2-r4.ebuild
@@ -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/dev-libs/dmalloc/dmalloc-5.5.2-r4.ebuild,v 1.9 2012/06/14 15:33:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/dmalloc-5.5.2-r4.ebuild,v 1.10 2012/07/08 16:07:24 armin76 Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="http://dmalloc.com/releases/${P}.tgz"
LICENSE="CCPL-Attribution-ShareAlike-3.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="static-libs threads"
DEPEND="sys-apps/texinfo"
diff --git a/dev-libs/libdnet/libdnet-1.11-r2.ebuild b/dev-libs/libdnet/libdnet-1.11-r2.ebuild
index 5d1bc5bc05e1..ffee0b37055c 100644
--- a/dev-libs/libdnet/libdnet-1.11-r2.ebuild
+++ b/dev-libs/libdnet/libdnet-1.11-r2.ebuild
@@ -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/dev-libs/libdnet/libdnet-1.11-r2.ebuild,v 1.9 2012/06/21 14:49:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdnet/libdnet-1.11-r2.ebuild,v 1.10 2012/07/08 17:29:47 armin76 Exp $
EAPI=4
PYTHON_DEPEND="python? 2"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/libdnet/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
-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="python static-libs"
RESTRICT="test"
diff --git a/dev-libs/libffi/libffi-3.0.11.ebuild b/dev-libs/libffi/libffi-3.0.11.ebuild
index 284d6039ccc9..ec50bda39385 100644
--- a/dev-libs/libffi/libffi-3.0.11.ebuild
+++ b/dev-libs/libffi/libffi-3.0.11.ebuild
@@ -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/dev-libs/libffi/libffi-3.0.11.ebuild,v 1.8 2012/06/13 19:49:51 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.11.ebuild,v 1.9 2012/07/08 18:26:43 armin76 Exp $
EAPI=4
@@ -14,7 +14,7 @@ SRC_URI="ftp://sourceware.org/pub/${PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug static-libs test"
RDEPEND=""
diff --git a/dev-libs/libgamin/files/libgamin-0.1.10-deadlock.patch b/dev-libs/libgamin/files/libgamin-0.1.10-deadlock.patch
new file mode 100644
index 000000000000..9f2b2a5150bd
--- /dev/null
+++ b/dev-libs/libgamin/files/libgamin-0.1.10-deadlock.patch
@@ -0,0 +1,65 @@
+From cc14440eface093548cb3bc7814da11d9a99d283 Mon Sep 17 00:00:00 2001
+From: Anssi Hannula
+Date: Wed, 4 Jan 2012 00:23:55 +0200
+Subject: [PATCH] fix possible server deadlock in ih_sub_cancel
+
+ih_sub_foreach() calls ih_sub_cancel() while inotify_lock is locked.
+However, ih_sub_cancel() locks it again, and locking GMutex recursively
+causes undefined behaviour.
+
+Fix that by removing locking from ih_sub_cancel() as ih_sub_foreach()
+is its only user. Also make the function static so that it won't
+accidentally get used by other files without locking (inotify-helper.h
+is an internal server header).
+
+This should fix the intermittent deadlocks I've been experiencing
+causing KDE applications to no longer start, and probably also
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361
+---
+ server/inotify-helper.c | 7 ++-----
+ server/inotify-helper.h | 1 -
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/server/inotify-helper.c b/server/inotify-helper.c
+index d77203e..0789fa4 100644
+--- a/server/inotify-helper.c
++++ b/server/inotify-helper.c
+@@ -123,13 +123,11 @@ ih_sub_add (ih_sub_t * sub)
+
+ /**
+ * Cancels a subscription which was being monitored.
++ * inotify_lock must be held when calling.
+ */
+-gboolean
++static gboolean
+ ih_sub_cancel (ih_sub_t * sub)
+ {
+- G_LOCK(inotify_lock);
+-
+-
+ if (!sub->cancelled)
+ {
+ IH_W("cancelling %s\n", sub->pathname);
+@@ -140,7 +138,6 @@ ih_sub_cancel (ih_sub_t * sub)
+ sub_list = g_list_remove (sub_list, sub);
+ }
+
+- G_UNLOCK(inotify_lock);
+ return TRUE;
+ }
+
+diff --git a/server/inotify-helper.h b/server/inotify-helper.h
+index 5d3b6d0..d36b5fd 100644
+--- a/server/inotify-helper.h
++++ b/server/inotify-helper.h
+@@ -34,7 +34,6 @@ gboolean ih_startup (event_callback_t ecb,
+ found_callback_t fcb);
+ gboolean ih_running (void);
+ gboolean ih_sub_add (ih_sub_t *sub);
+-gboolean ih_sub_cancel (ih_sub_t *sub);
+
+ /* Return FALSE from 'f' if the subscription should be cancelled */
+ void ih_sub_foreach (void *callerdata, gboolean (*f)(ih_sub_t *sub, void *callerdata));
+--
+1.7.7.2
+
diff --git a/dev-libs/libgamin/libgamin-0.1.10-r3.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r3.ebuild
new file mode 100644
index 000000000000..404fe9d0b670
--- /dev/null
+++ b/dev-libs/libgamin/libgamin-0.1.10-r3.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/libgamin-0.1.10-r3.ebuild,v 1.1 2012/07/08 11:47:14 pacho Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? 2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+GNOME_ORG_MODULE="gamin"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit autotools eutils flag-o-matic libtool python gnome.org
+
+DESCRIPTION="Library providing the FAM File Alteration Monitor API"
+HOMEPAGE="http://www.gnome.org/~veillard/gamin/"
+SRC_URI="${SRC_URI}
+ mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2
+ http://dev.gentoo.org/~grobian/patches/libgamin-0.1.10-opensolaris.patch.bz2
+ http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug kernel_linux python static-libs"
+
+RESTRICT="test" # needs gam-server
+
+RDEPEND="!app-admin/fam
+ !=sys-libs/gdbm-1.8.0
+ emacs? ( virtual/emacs )
+ readline? ( sys-libs/readline )"
+DEPEND="${RDEPEND}
+ sys-apps/texinfo
+ app-arch/xz-utils"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.92.0-disable-elisp.patch
+}
+
+src_configure() {
+ econf \
+ --libexecdir=/usr/$(get_libdir) \
+ --without-gmp \
+ --without-ffi \
+ --disable-static \
+ $(use_with readline)
+}
+
+src_compile() {
+ emake
+
+ if use emacs; then
+ elisp-compile rep-debugger.el || die "elisp-compile failed"
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
+
+ dodoc ChangeLog MAINTAINERS NEWS README TODO
+ docinto doc
+ dodoc doc/*
+
+ if use emacs; then
+ elisp-install ${PN} rep-debugger.{el,elc} || die "elisp-install failed"
+ elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" \
+ || die "elisp-site-file-install failed"
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-libs/libreport/Manifest b/dev-libs/libreport/Manifest
index b63a1cbc5d96..151fa3127a78 100644
--- a/dev-libs/libreport/Manifest
+++ b/dev-libs/libreport/Manifest
@@ -1,2 +1,2 @@
-DIST libreport-2.0.7.tar.gz 840854 SHA256 b457dbf371b9af9557244f7d4cd5b5afa92deb6e1ad199dc9458ecd1c6c1964b SHA512 b3d7fdcf7e38d35fb70bb5fddc82d12bfb0f2a191cfcfddc50ff1e40a75a25620ba20d6adfabaa744259ed6c231f8765fe3c08ad23d0ceccc82dcef5be74c102 WHIRLPOOL d47be39544fead9789fe8423a4861ca6a20009d31d69d99432417cbda3a820850fea6b5e73273d7b75363662415d5aab948f1e2427402032ee1df35a315e78f0
+DIST libreport-2.0.10.tar.gz 1204194 SHA256 ab8f2bb2eeb93719b6a946b8a810527cec653815fd59c3fb03efca88e6e80408 SHA512 f9eca6aacb28c856e5bc109545dbd371baf57de4f2431b988dfce0d9d1a1e38269a056a924453bbfaed7c80890ddddbddca086754385a7397e23b6d1b8a17702 WHIRLPOOL 2429cd98c9d897a953956d92a9680fd65ccaf79f89da84c0862356c11acf318a50b41a674ac4de07e020836a2e4efcd38f1d949e2136a2abb854324a2c9a2a5a
DIST libreport-2.0.9.tar.gz 1088917 SHA256 c63f259838d75c42f7557fe00b57beef7e889723864d35c89a003c81a8722e3d SHA512 38a3b1b7e5f8938a359a83b1a74087711fc369dc990c4a9727587473bd86aee297734fb0fdf30cc39e937f2ed03fb3697926d4fb7780dc82313f70a24d5d535b WHIRLPOOL cf16faccb5e6a02f3b38031433f17a2c8506f9fbcff9892c228459334f3afb2b6e4d107652a97fd24688f766c29b5d05e911d5fa47910f90ede49fa230bc6ab6
diff --git a/dev-libs/libreport/libreport-2.0.7.ebuild b/dev-libs/libreport/libreport-2.0.10.ebuild
similarity index 80%
rename from dev-libs/libreport/libreport-2.0.7.ebuild
rename to dev-libs/libreport/libreport-2.0.10.ebuild
index 994be16de8b3..c627d16921be 100644
--- a/dev-libs/libreport/libreport-2.0.7.ebuild
+++ b/dev-libs/libreport/libreport-2.0.10.ebuild
@@ -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/dev-libs/libreport/libreport-2.0.7.ebuild,v 1.7 2012/06/06 03:37:34 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libreport/libreport-2.0.10.ebuild,v 1.2 2012/07/08 17:19:34 jlec Exp $
EAPI="4"
PYTHON_DEPEND="2:2.6"
@@ -13,7 +13,7 @@ SRC_URI="https://fedorahosted.org/released/abrt/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="debug"
RDEPEND=">=dev-libs/glib-2.21:2
@@ -23,6 +23,7 @@ RDEPEND=">=dev-libs/glib-2.21:2
dev-libs/libxml2
dev-libs/xmlrpc-c
gnome-base/gnome-keyring
+ net-libs/libproxy
net-misc/curl[ssl]
sys-apps/dbus
x11-libs/gtk+:2"
@@ -45,27 +46,34 @@ pkg_setup() {
}
src_prepare() {
- # Replace redhat-specific defaults with gentoo ones
- epatch "${FILESDIR}/${PN}-2.0.7-gentoo.patch"
+ # Replace redhat- and fedora-specific defaults with gentoo ones
+ epatch "${FILESDIR}/${PN}-2.0.9-gentoo.patch"
# Disable bugzilla plugin for now (requires bugs.gentoo.org infra support)
- epatch "${FILESDIR}/${PN}-2.0.7-no-bugzilla.patch"
+ epatch "${FILESDIR}/${PN}-2.0.9-no-bugzilla.patch"
# Modify uploader_event so that the gui recognizes it
epatch "${FILESDIR}/${PN}-2.0.7-uploader_event-syntax.patch"
- # https://bugzilla.redhat.com/show_bug.cgi?id=751833, in next release
- epatch "${FILESDIR}/${P}-multiple-tabs.patch"
+ # automake-1.12
+ sed \
+ -e 's:AM_PROG_MKDIR_P:AC_PROG_MKDIR_P:g' \
+ -i aclocal.m4 || die
+ sed \
+ -e 's:mkdir_p:MKDIR_P:g' \
+ -i src/plugins/Makefile.am src/lib/Makefile.am || die
+ sed \
+ -e "/AC_PROG_LIBTOOL/s:^:AM_PROG_AR\n:g" \
+ -i configure.ac || die
# -Werror should not be used by default
sed -e "s/-Werror\( \|$\)//" \
-i src/client-python/Makefile.* src/cli/Makefile.* \
src/gtk-helpers/Makefile.* src/gui-wizard-gtk/Makefile.* \
src/lib/Makefile.* src/plugins/Makefile.* \
- src/report-python/Makefile.* || die "sed failed"
+ src/report-python/Makefile.* configure.ac || die "sed failed"
- # disable pyc compiling
- echo '#!/bin/sh' > py-compile
+ python_clean_py-compile_files
mkdir m4
eautoreconf
diff --git a/dev-libs/libxr/metadata.xml b/dev-libs/libxr/metadata.xml
index 34f59f48aadd..6eb35690d41d 100644
--- a/dev-libs/libxr/metadata.xml
+++ b/dev-libs/libxr/metadata.xml
@@ -4,7 +4,4 @@
lu_zero@gentoo.org
-
- flameeyes@gentoo.org
-
diff --git a/dev-lua/luasocket/metadata.xml b/dev-lua/luasocket/metadata.xml
index deb715b69c85..1470e032181b 100644
--- a/dev-lua/luasocket/metadata.xml
+++ b/dev-lua/luasocket/metadata.xml
@@ -2,11 +2,6 @@
- flameeyes@gentoo.org
-
- I need this for app-crypt/ekeyd, if you care about this for LUA,
- or for any other reason, you're free to pick it up; please just
- leave the unix socket support in, thanks!
-
+ maintainer-needed@gentoo.org
diff --git a/dev-perl/crypt-dh/Manifest b/dev-perl/crypt-dh/Manifest
index b454300165b2..4338a23f2c97 100644
--- a/dev-perl/crypt-dh/Manifest
+++ b/dev-perl/crypt-dh/Manifest
@@ -1 +1,2 @@
DIST Crypt-DH-0.06.tar.gz 18088 SHA256 78f14d7c776793655633d5e53e8ebf699e2ae2782c7951130af6f593a32a29c1 SHA512 ebdf22eadaaf74c25f1486410dbb4e006201b7659315f92b1219a2fa8e8c91fa2d697fa010e5df45581ddb41eeb43e49d27d462b1b33abc647ddf5448200064e WHIRLPOOL a0c7f2581c7ccbcd0042e6156d8e3482194a47807c947ceaaf41aac65440495dab1aa2f25f122009208c9ddb8d62cd91a1087eed6519f136ae3889379eb03551
+DIST Crypt-DH-0.07.tar.gz 43736 SHA256 c88cf3423b01e6782e8986d7fe5304436ab84b0925c4498c6fdfa17ef9a37f5f SHA512 60e58403e513535463290255989e9f2263107aeae6831d51d761e18527b1745baa45c16f655452fd618a0fb0e98413d5ed68f3926247ab2ad2da4032863b8ee7 WHIRLPOOL aa50b3788728f358265f478ad564afa7915af3090dd0dde4b56f0ce78126df22b4f6fb83d82335db8e4133294d496b33e865a94cda63c96ee3e5ff0f24783ee7
diff --git a/dev-perl/crypt-dh/crypt-dh-0.70.0.ebuild b/dev-perl/crypt-dh/crypt-dh-0.70.0.ebuild
new file mode 100644
index 000000000000..7870d47a625d
--- /dev/null
+++ b/dev-perl/crypt-dh/crypt-dh-0.70.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/crypt-dh/crypt-dh-0.70.0.ebuild,v 1.1 2012/07/07 19:02:18 tove Exp $
+
+EAPI=4
+
+MY_PN=Crypt-DH
+MODULE_AUTHOR=MITHALDU
+MODULE_VERSION=0.07
+inherit perl-module
+
+DESCRIPTION="Diffie-Hellman key exchange system"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-libs/gmp
+ dev-perl/Math-BigInt-GMP
+ >=virtual/perl-Math-BigInt-1.60
+ dev-perl/crypt-random
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r1.ebuild b/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r1.ebuild
index 1a609882f596..1d9cd01c0da7 100644
--- a/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r1.ebuild
+++ b/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r1.ebuild
@@ -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/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r1.ebuild,v 1.5 2012/06/22 15:54:52 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r1.ebuild,v 1.6 2012/07/08 17:34:08 armin76 Exp $
EAPI="2"
@@ -9,7 +9,7 @@ inherit php-pear-r1 eutils
DESCRIPTION="Miscellaneous HTTP utilities."
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ~ppc ppc64 sparc x86"
IUSE=""
DEPEND="|| ( =dev-lang/php-5.3 )"
diff --git a/dev-php/PEAR-I18Nv2/PEAR-I18Nv2-0.11.4-r1.ebuild b/dev-php/PEAR-I18Nv2/PEAR-I18Nv2-0.11.4-r1.ebuild
index 5a0607a42991..b5846868d4ad 100644
--- a/dev-php/PEAR-I18Nv2/PEAR-I18Nv2-0.11.4-r1.ebuild
+++ b/dev-php/PEAR-I18Nv2/PEAR-I18Nv2-0.11.4-r1.ebuild
@@ -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/dev-php/PEAR-I18Nv2/PEAR-I18Nv2-0.11.4-r1.ebuild,v 1.5 2012/06/22 15:55:46 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-I18Nv2/PEAR-I18Nv2-0.11.4-r1.ebuild,v 1.6 2012/07/08 17:39:02 armin76 Exp $
EAPI="2"
@@ -9,6 +9,6 @@ inherit php-pear-r1
DESCRIPTION="Internationalization - basic support to localize your application."
LICENSE="PHP-3"
SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ~ppc ppc64 sparc x86"
IUSE=""
DEPEND="|| ( =dev-lang/php-5.3[iconv] )"
diff --git a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.2.1-r2.ebuild b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.2.1-r2.ebuild
index b1f50618ff49..abc2a3fb1dab 100644
--- a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.2.1-r2.ebuild
+++ b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.2.1-r2.ebuild
@@ -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/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.2.1-r2.ebuild,v 1.8 2012/06/17 20:08:03 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.2.1-r2.ebuild,v 1.9 2012/07/08 16:32:31 armin76 Exp $
EAPI="2"
@@ -11,7 +11,7 @@ DESCRIPTION="XML utility class"
LICENSE="PHP-2.02"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
IUSE=""
SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
diff --git a/dev-python/PyQt4/PyQt4-4.9.1.ebuild b/dev-python/PyQt4/PyQt4-4.9.1.ebuild
index 4b5d2038de3d..28f921efdd35 100644
--- a/dev-python/PyQt4/PyQt4-4.9.1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.9.1.ebuild
@@ -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/dev-python/PyQt4/PyQt4-4.9.1.ebuild,v 1.12 2012/05/23 04:48:54 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.1.ebuild,v 1.13 2012/07/08 18:28:38 armin76 Exp $
EAPI=4
@@ -27,7 +27,7 @@ fi
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="X assistant dbus debug declarative doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns"
REQUIRED_USE="
diff --git a/dev-python/PyQt4/PyQt4-4.9.4.ebuild b/dev-python/PyQt4/PyQt4-4.9.4.ebuild
index d37568ed384b..33d0c8765d60 100644
--- a/dev-python/PyQt4/PyQt4-4.9.4.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.9.4.ebuild
@@ -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/dev-python/PyQt4/PyQt4-4.9.4.ebuild,v 1.1 2012/07/02 14:09:25 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.4.ebuild,v 1.2 2012/07/08 18:28:38 armin76 Exp $
EAPI=4
@@ -27,7 +27,7 @@ fi
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="X assistant dbus debug declarative doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns"
REQUIRED_USE="
diff --git a/dev-python/cliapp/Manifest b/dev-python/cliapp/Manifest
index 4ac29430d181..5b608e1da974 100644
--- a/dev-python/cliapp/Manifest
+++ b/dev-python/cliapp/Manifest
@@ -1 +1,2 @@
DIST python-cliapp_0.29.orig.tar.gz 42593 SHA256 4a3f2e1705c5e9ac5a80a460ae9bad8e88c0778f7013638eda39e3ee0dd008b2 SHA512 983fdbc3ab85c89deb4bb0df04516dbd072732a95f4dd289f637de48c01d7ffa6ae1b0417331057a575e397a5cfb2115fa70ac3f90a235f5143ca34c6a5b1195 WHIRLPOOL c35c10ee392ffa1cb9677dd62d50353043f6a476a41630261264c123df192c0e6d13ceada5d3525131f8b889f223e9991ec8a4e313dd6baafcc92be5128318d2
+DIST python-cliapp_1.20120630.orig.tar.gz 42749 SHA256 6beeb1fb3077561540094584ce36055266ac67b80f158b9b82fe4075096f4716 SHA512 ccd44906d2e897c91f4aee631da94f324c6f0b2b10216315a2d4c1e99f6cbcd8794e4de66a259e7f97261fbe62faa157e150a8c17b255124f631c3e7b05f4c75 WHIRLPOOL 08020ea7384f53f709b20228d4663ab5c5395173c5dc357dec1863ddc38d5060599e003f651494edc0187acd1b23d4e892ff878412505b4d84e670ae8645003a
diff --git a/dev-python/cliapp/cliapp-1.20120630.ebuild b/dev-python/cliapp/cliapp-1.20120630.ebuild
new file mode 100644
index 000000000000..ae9329498a3f
--- /dev/null
+++ b/dev-python/cliapp/cliapp-1.20120630.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cliapp/cliapp-1.20120630.ebuild,v 1.1 2012/07/08 23:46:42 mschiff Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.6:2.7"
+
+inherit distutils python
+
+DESCRIPTION="Framework for Unix-like command line programs"
+HOMEPAGE="http://liw.fi/cliapp/"
+SRC_URI="http://code.liw.fi/debian/pool/main/p/python-${PN}/python-${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-python/CoverageTestRunner )"
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_test() {
+ # remove build directory so tests will not fail
+ # due to tests defined twice
+ rm -rf "${S}"/build
+ default
+}
diff --git a/dev-python/pychecker/pychecker-0.8.19.ebuild b/dev-python/pychecker/pychecker-0.8.19.ebuild
index 8fcc1fae3b2f..ee27dbfedf1a 100644
--- a/dev-python/pychecker/pychecker-0.8.19.ebuild
+++ b/dev-python/pychecker/pychecker-0.8.19.ebuild
@@ -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/dev-python/pychecker/pychecker-0.8.19.ebuild,v 1.8 2012/06/08 12:08:23 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pychecker/pychecker-0.8.19.ebuild,v 1.9 2012/07/08 15:32:10 armin76 Exp $
EAPI="3"
PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/pychecker/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
DEPEND=""
diff --git a/dev-python/pycups/pycups-1.9.61.ebuild b/dev-python/pycups/pycups-1.9.61.ebuild
index 67fe3d9519d3..c94cd49030ce 100644
--- a/dev-python/pycups/pycups-1.9.61.ebuild
+++ b/dev-python/pycups/pycups-1.9.61.ebuild
@@ -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/dev-python/pycups/pycups-1.9.61.ebuild,v 1.6 2012/06/07 22:11:12 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycups/pycups-1.9.61.ebuild,v 1.7 2012/07/08 15:13:32 armin76 Exp $
EAPI="3"
@@ -13,7 +13,7 @@ HOMEPAGE="http://cyberelk.net/tim/data/pycups/"
SRC_URI="http://cyberelk.net/tim/data/pycups/${P}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sh sparc x86"
SLOT="0"
IUSE="doc examples"
diff --git a/dev-python/pyelemental/files/pyelemental-1.2.0-gcc-4.7.patch b/dev-python/pyelemental/files/pyelemental-1.2.0-gcc-4.7.patch
new file mode 100644
index 000000000000..a0a53a67be28
--- /dev/null
+++ b/dev-python/pyelemental/files/pyelemental-1.2.0-gcc-4.7.patch
@@ -0,0 +1,25 @@
+ value-types.tcc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/value-types.tcc b/value-types.tcc
+index 5afc8d0..a95ccbf 100644
+--- a/value-types.tcc
++++ b/value-types.tcc
+@@ -44,7 +44,7 @@ ValueType_t (bool)::ready (PyObject* module)
+
+ ValueType_t (PyObject*)::wrap (const cxxtype& source)
+ {
+- return wrap_copy (&type, source);
++ return ValueType::wrap_copy (&type, source);
+ }
+
+
+@@ -160,7 +160,7 @@ ValueListType_t (bool)::ready (PyObject* module)
+
+ ValueListType_t (PyObject*)::wrap (const cxxtype& source)
+ {
+- return wrap_copy (&type, source);
++ return ValueListType::wrap_copy (&type, source);
+ }
+
+
diff --git a/dev-python/pyelemental/pyelemental-1.2.0.ebuild b/dev-python/pyelemental/pyelemental-1.2.0.ebuild
index 952633a25d46..9115389bf880 100644
--- a/dev-python/pyelemental/pyelemental-1.2.0.ebuild
+++ b/dev-python/pyelemental/pyelemental-1.2.0.ebuild
@@ -1,16 +1,17 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyelemental/pyelemental-1.2.0.ebuild,v 1.5 2012/05/04 15:12:15 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyelemental/pyelemental-1.2.0.ebuild,v 1.6 2012/07/08 17:42:28 jlec Exp $
+
+EAPI=4
-EAPI="3"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-* *-jython"
-inherit distutils
+inherit distutils eutils
DESCRIPTION="Python bindings for libelemental (sci-chemistry/gelemental)"
-HOMEPAGE="http://www.kdau.com/projects/gelemental"
+HOMEPAGE="http://freecode.com/projects/gelemental/"
SRC_URI="http://www.kdau.com/files/${P}.tar.bz2"
LICENSE="GPL-3"
@@ -24,6 +25,11 @@ DEPEND="${RDEPEND}
DOCS="AUTHORS NEWS"
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gcc-4.7.patch
+ distutils_src_prepare
+}
+
src_install() {
distutils_src_install
dohtml docs/html/*.html || die "dohtml failed"
diff --git a/dev-python/pyparsing/pyparsing-1.5.6.ebuild b/dev-python/pyparsing/pyparsing-1.5.6.ebuild
index 9a4f217c6d4f..2d043bd85eb4 100644
--- a/dev-python/pyparsing/pyparsing-1.5.6.ebuild
+++ b/dev-python/pyparsing/pyparsing-1.5.6.ebuild
@@ -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/dev-python/pyparsing/pyparsing-1.5.6.ebuild,v 1.11 2012/06/07 22:05:40 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/pyparsing-1.5.6.ebuild,v 1.12 2012/07/08 15:12:27 armin76 Exp $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc examples"
DEPEND=""
diff --git a/dev-python/sip/sip-4.13.2-r1.ebuild b/dev-python/sip/sip-4.13.2-r1.ebuild
index c0997e8e1eb8..818b839bd2b9 100644
--- a/dev-python/sip/sip-4.13.2-r1.ebuild
+++ b/dev-python/sip/sip-4.13.2-r1.ebuild
@@ -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/dev-python/sip/sip-4.13.2-r1.ebuild,v 1.5 2012/05/23 04:50:03 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.13.2-r1.ebuild,v 1.6 2012/07/08 18:25:51 armin76 Exp $
EAPI="4"
PYTHON_DEPEND="*"
@@ -16,7 +16,7 @@ SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}${PV%%.*}/${P}.
LICENSE="|| ( GPL-2 GPL-3 sip )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="debug doc"
DEPEND=""
diff --git a/dev-python/ttystatus/Manifest b/dev-python/ttystatus/Manifest
index 7216a31c86d8..62fb901f2fa8 100644
--- a/dev-python/ttystatus/Manifest
+++ b/dev-python/ttystatus/Manifest
@@ -1 +1,2 @@
DIST python-ttystatus_0.18.orig.tar.gz 29999 SHA256 9fab747f3e1f474b66101354b06f943120d72d1f1e353b4692e7e6cca226b9cc SHA512 e4b56bc966cdd2299ab00f3863641050e510fa42d084ec605dbc3838dfdd38652059b56bbe16f3ecadacf88a5431e19bc0b252c75f812a915dec37fcb1aaf135 WHIRLPOOL 6e3ec217af9ff4660fca8d4959c6d3ba1258c572f9bc567c4dea61d6a099aa7f78145afeb76182d8f21a1556bdcf13817d090b0827715f087aa61d54ae37724e
+DIST python-ttystatus_0.19.orig.tar.gz 29139 SHA256 7cc112a4783f2e0c354c5244f8e50b18733b5957677b56a755c1016e04c0c28d SHA512 1125947ffd915bfe017f94501a1a69f549a5b5ecba337e1cd639a179747b1aa75a1403c119215439a7648c5ddbcea06fd1879f1eb0733f96a2607e163f1572ae WHIRLPOOL 08dd8959d62c20dca579524621c7597aed592a52c0637f244f293e393370621d857f345d864916ae75d050181f180192642a7e5410dc0715fde39983d0cdd25b
diff --git a/dev-python/ttystatus/ttystatus-0.19.ebuild b/dev-python/ttystatus/ttystatus-0.19.ebuild
new file mode 100644
index 000000000000..b3bbfae1c775
--- /dev/null
+++ b/dev-python/ttystatus/ttystatus-0.19.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ttystatus/ttystatus-0.19.ebuild,v 1.1 2012/07/08 23:43:13 mschiff Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.6:2.7"
+
+inherit distutils python
+
+DESCRIPTION="Terminal progress bar and status output for command line"
+HOMEPAGE="http://liw.fi/ttystatus/"
+SRC_URI="http://code.liw.fi/debian/pool/main/p/python-${PN}/python-${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="test"
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
diff --git a/dev-python/visual/files/visual-5.74-boost-1.50.patch b/dev-python/visual/files/visual-5.74-boost-1.50.patch
new file mode 100644
index 000000000000..a66ded258987
--- /dev/null
+++ b/dev-python/visual/files/visual-5.74-boost-1.50.patch
@@ -0,0 +1,28 @@
+https://github.com/vpython/visual/issues/3
+
+--- dependencies/threadpool/include/threadpool/task_adaptors.hpp
++++ dependencies/threadpool/include/threadpool/task_adaptors.hpp
+@@ -135,7 +135,11 @@
+ if(m_break_s > 0 || m_break_ns > 0)
+ { // Sleep some time before first execution
+ xtime xt;
++#if BOOST_VERSION >= 105000
++ xtime_get(&xt, TIME_UTC_);
++#else
+ xtime_get(&xt, TIME_UTC);
++#endif
+ xt.nsec += m_break_ns;
+ xt.sec += m_break_s;
+ thread::sleep(xt);
+@@ -146,7 +150,11 @@
+ if(m_break_s > 0 || m_break_ns > 0)
+ {
+ xtime xt;
++#if BOOST_VERSION >= 105000
++ xtime_get(&xt, TIME_UTC_);
++#else
+ xtime_get(&xt, TIME_UTC);
++#endif
+ xt.nsec += m_break_ns;
+ xt.sec += m_break_s;
+ thread::sleep(xt);
diff --git a/dev-python/visual/visual-5.74.ebuild b/dev-python/visual/visual-5.74.ebuild
index e2c458ee2fca..aee4e14bb694 100644
--- a/dev-python/visual/visual-5.74.ebuild
+++ b/dev-python/visual/visual-5.74.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/visual/visual-5.74.ebuild,v 1.2 2012/06/18 15:38:51 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/visual/visual-5.74.ebuild,v 1.3 2012/07/07 19:19:25 floppym Exp $
EAPI="4"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="2.5 3.* *-jython 2.7-pypy-*"
PYTHON_EXPORT_PHASE_FUNCTIONS="1"
-inherit flag-o-matic multilib python versionator
+inherit eutils flag-o-matic multilib python versionator
MY_P="${PN}-$(delete_version_separator 2)_release"
@@ -37,6 +37,8 @@ src_prepare() {
-e 's/2\?>>[[:space:]]*\$(LOGFILE).*//' \
src/Makefile.in || die
+ epatch "${FILESDIR}/${P}-boost-1.50.patch"
+
python_clean_py-compile_files
python_src_prepare
diff --git a/dev-ruby/awesome_print/awesome_print-1.0.1.ebuild b/dev-ruby/awesome_print/awesome_print-1.0.1.ebuild
index b01b049405fc..e6353956b561 100644
--- a/dev-ruby/awesome_print/awesome_print-1.0.1.ebuild
+++ b/dev-ruby/awesome_print/awesome_print-1.0.1.ebuild
@@ -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/dev-ruby/awesome_print/awesome_print-1.0.1.ebuild,v 1.3 2012/07/04 06:25:53 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/awesome_print/awesome_print-1.0.1.ebuild,v 1.4 2012/07/08 16:37:20 jer Exp $
EAPI=2
USE_RUBY="ruby18 ruby19 ree18 jruby"
@@ -16,7 +16,7 @@ DESCRIPTION="Ruby library that pretty prints Ruby objects in full color with pro
HOMEPAGE="http://github.com/michaeldv/awesome_print"
LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/bacon/bacon-1.1.0-r1.ebuild b/dev-ruby/bacon/bacon-1.1.0-r1.ebuild
index dffce61a2ccd..119d7656f2bb 100644
--- a/dev-ruby/bacon/bacon-1.1.0-r1.ebuild
+++ b/dev-ruby/bacon/bacon-1.1.0-r1.ebuild
@@ -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/dev-ruby/bacon/bacon-1.1.0-r1.ebuild,v 1.9 2012/05/01 18:24:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bacon/bacon-1.1.0-r1.ebuild,v 1.10 2012/07/08 16:12:13 jer Exp $
EAPI=2
USE_RUBY="ruby18 ruby19 ree18 jruby"
@@ -15,7 +15,7 @@ HOMEPAGE="http://chneukirchen.org/repos/bacon"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RUBY_PATCHES="${FILESDIR}/${P}+ruby-1.9.2.patch"
diff --git a/dev-ruby/bcat/bcat-0.6.2.ebuild b/dev-ruby/bcat/bcat-0.6.2.ebuild
index 87f138a5c681..2a01f47602aa 100644
--- a/dev-ruby/bcat/bcat-0.6.2.ebuild
+++ b/dev-ruby/bcat/bcat-0.6.2.ebuild
@@ -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/dev-ruby/bcat/bcat-0.6.2.ebuild,v 1.3 2012/03/02 16:35:40 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bcat/bcat-0.6.2.ebuild,v 1.4 2012/07/08 16:27:24 jer Exp $
EAPI=4
USE_RUBY="ruby18 ruby19 ree18"
@@ -15,7 +15,7 @@ HOMEPAGE="http://github.com/rtomayko/bcat"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86-fbsd"
+KEYWORDS="~amd64 ~hppa ~x86-fbsd"
IUSE=""
ruby_add_bdepend "doc? ( app-text/ronn )"
diff --git a/dev-ruby/childprocess/childprocess-0.3.3.ebuild b/dev-ruby/childprocess/childprocess-0.3.3.ebuild
index d56da8ba2685..43c4321bf118 100644
--- a/dev-ruby/childprocess/childprocess-0.3.3.ebuild
+++ b/dev-ruby/childprocess/childprocess-0.3.3.ebuild
@@ -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/dev-ruby/childprocess/childprocess-0.3.3.ebuild,v 1.1 2012/07/06 00:02:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/childprocess/childprocess-0.3.3.ebuild,v 1.2 2012/07/08 16:34:10 jer Exp $
EAPI=4
USE_RUBY="ruby18 ruby19 ree18 jruby"
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/jarib/childprocess"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~x86"
IUSE=""
ruby_add_bdepend "doc? ( dev-ruby/yard dev-ruby/rspec:2 )"
diff --git a/dev-ruby/daemons/daemons-1.1.8.ebuild b/dev-ruby/daemons/daemons-1.1.8.ebuild
index 72156cbbd19a..139bfe0ba1db 100644
--- a/dev-ruby/daemons/daemons-1.1.8.ebuild
+++ b/dev-ruby/daemons/daemons-1.1.8.ebuild
@@ -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/dev-ruby/daemons/daemons-1.1.8.ebuild,v 1.4 2012/06/26 08:11:09 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/daemons/daemons-1.1.8.ebuild,v 1.5 2012/07/08 16:19:01 jer Exp $
EAPI=4
USE_RUBY="ruby18 ree18 ruby19 jruby"
@@ -17,7 +17,7 @@ HOMEPAGE="http://daemons.rubyforge.org/"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="examples"
all_ruby_install() {
diff --git a/dev-ruby/dnsruby/Manifest b/dev-ruby/dnsruby/Manifest
index 7e238f98ddde..d2ac838b3f01 100644
--- a/dev-ruby/dnsruby/Manifest
+++ b/dev-ruby/dnsruby/Manifest
@@ -1,2 +1 @@
-DIST dnsruby-1.52.gem 352768 SHA256 db9e9858f64aa2665ff4b4dc9269acb5220efcaa2ffd52fd0b834d6b0877f9ef SHA512 14c1099344c39f59230e3b852c1055c46782efb4888a460386ca8a722de09daac3cf8258c056b8fdec270595c34967f0caf738d534a4a6894e32756af7a244e4 WHIRLPOOL be7d4b5b8da7a89045209faeb28573417ab66e90a6acc85a572eec8c4efa9a2f3069b941b33b3b1e91a42bc132066c1db0c37af3419600dea5edd76f92158fbe
DIST dnsruby-1.53.gem 205824 SHA256 de8a6a12b4169bd91ec6a76467f55f4c9e3a7950ee3f2a69a94216e5dab274b3 SHA512 4357db6c84d20d77db3cc4a93955f188aafb46b29d99937062d62bfa45351b6a7a99c46556118cb0a6a46ad2a751e0ab2a455d74dd2919143254e342826b50fb WHIRLPOOL 44610beeef2b7ab7469d54ca6173ab08b3baf667ca07b8f816f4f817d8d0565cd42af5acc4d38430a98e850fbbdcc4caa193a0889a4cf620065ffe1a77f3e031
diff --git a/dev-ruby/dnsruby/dnsruby-1.52.ebuild b/dev-ruby/dnsruby/dnsruby-1.52.ebuild
deleted file mode 100644
index 6a9edadea04b..000000000000
--- a/dev-ruby/dnsruby/dnsruby-1.52.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/dnsruby/dnsruby-1.52.ebuild,v 1.1 2011/06/02 11:07:54 scarabeus Exp $
-
-EAPI=4
-
-USE_RUBY="ruby18"
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_DOCDIR="html"
-RUBY_FAKEGEM_EXTRADOC="DNSSEC EXAMPLES README"
-inherit ruby-fakegem
-
-DESCRIPTION="A pure Ruby DNS client library"
-HOMEPAGE="http://rubyforge.org/projects/dnsruby/"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-each_ruby_test() {
- # only run offline tests
- #${RUBY} -I lib test/ts_dnsruby.rb || die "test failed"
- ${RUBY} -I lib test/ts_offline.rb || die "test failed"
-}
diff --git a/dev-ruby/fast_xs/fast_xs-0.8.0.ebuild b/dev-ruby/fast_xs/fast_xs-0.8.0.ebuild
index 0f8e47323202..0315fe14d264 100644
--- a/dev-ruby/fast_xs/fast_xs-0.8.0.ebuild
+++ b/dev-ruby/fast_xs/fast_xs-0.8.0.ebuild
@@ -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/dev-ruby/fast_xs/fast_xs-0.8.0.ebuild,v 1.5 2012/04/28 23:46:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fast_xs/fast_xs-0.8.0.ebuild,v 1.6 2012/07/08 16:22:54 jer Exp $
EAPI=4
@@ -18,7 +18,7 @@ HOMEPAGE="http://fast-xs.rubyforge.org/"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86 ~x86-fbsd"
IUSE=""
ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.3.2 )"
diff --git a/dev-ruby/fastthread/fastthread-1.0.7-r2.ebuild b/dev-ruby/fastthread/fastthread-1.0.7-r2.ebuild
index a5d53fa46389..a42b5092160b 100644
--- a/dev-ruby/fastthread/fastthread-1.0.7-r2.ebuild
+++ b/dev-ruby/fastthread/fastthread-1.0.7-r2.ebuild
@@ -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/dev-ruby/fastthread/fastthread-1.0.7-r2.ebuild,v 1.2 2012/05/01 18:24:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fastthread/fastthread-1.0.7-r2.ebuild,v 1.3 2012/07/08 16:20:46 jer Exp $
EAPI=2
@@ -22,7 +22,7 @@ HOMEPAGE="http://gemcutter.org/gems/fastthread"
LICENSE="Ruby"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "doc? ( >=dev-ruby/echoe-2.7.1 )"
diff --git a/dev-ruby/ffi/ffi-1.0.11.ebuild b/dev-ruby/ffi/ffi-1.0.11.ebuild
index a12afd481a79..b1159d9314ea 100644
--- a/dev-ruby/ffi/ffi-1.0.11.ebuild
+++ b/dev-ruby/ffi/ffi-1.0.11.ebuild
@@ -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/dev-ruby/ffi/ffi-1.0.11.ebuild,v 1.2 2012/01/03 18:36:35 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ffi/ffi-1.0.11.ebuild,v 1.3 2012/07/08 16:33:01 jer Exp $
EAPI=4
@@ -25,7 +25,7 @@ RUBY_S="${PN}-${PN}-*"
IUSE=""
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
RDEPEND="${RDEPEND} virtual/libffi"
DEPEND="${DEPEND} virtual/libffi"
diff --git a/dev-ruby/file-tail/Manifest b/dev-ruby/file-tail/Manifest
index ed9691ad9508..8f6228d64fce 100644
--- a/dev-ruby/file-tail/Manifest
+++ b/dev-ruby/file-tail/Manifest
@@ -1,2 +1,2 @@
-DIST file-tail-1.0.6.gem 22528 SHA256 12f58e02f82f16633dcb230e0b3f4f9915937228f9663dac47b002d31f4cabf8 SHA512 0f3128bc2057d23945aa426d3b1883cc114d960dac8f668cfd1d37695ab3a55191ac26b101095d940ea74f298f1d23fcac449c7ac27b040db05a327bc7a7f4b7 WHIRLPOOL af55cadc79d5932b4952a33fea3c26dc19546400b3c74e332eada1a615b546c5b556eb46cac846d99fd0d6539170ebe2b008fafc92b89a9be1d9c89057ef03b2
+DIST file-tail-1.0.10.gem 22016 SHA256 6dfe2aa87f71320e8e58dadcab245a7185154d57b07686d79f31d64418e9b53b SHA512 6d0ad7138d872127a2859bf30aba0c585876dc528d602ac8ad3f444e9e22779f810e791b9c2e5f822faa613e8b83214ecd98f9549cf73bfcbcc19b00ae3eca3a WHIRLPOOL 2b6c9b620f40044fa9b197cd8f8e2c9eb3fbbc53047edfed462123a87a6caa9fc00b0e5da85d504b60440e07d8e3bae3d70efef62c80a7057caa0c86ec0684a1
DIST file-tail-1.0.8.gem 22016 SHA256 f4da08de18a3b0a7d1e9e6fef1716c373cb60f1d2b9cb57d4171309640eeba76 SHA512 24ce7e5dfd81d65d43468f179fba073ebce0f1494f1199186225be113ef0c5edad0e607495b5062fa1e66613d5e5bd1eb9ac7b089a7d8a904f7c3baedeba284a WHIRLPOOL 724a1db4752436d6dc93e42e87a7efcc1424be4d58840d4ad2c94e81d4d06cd30498114ab52289e54e830a1f4bc62fdde234b0955af637099384e90f178eabce
diff --git a/dev-ruby/file-tail/file-tail-1.0.10.ebuild b/dev-ruby/file-tail/file-tail-1.0.10.ebuild
new file mode 100644
index 000000000000..1013b7f74ae5
--- /dev/null
+++ b/dev-ruby/file-tail/file-tail-1.0.10.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/file-tail/file-tail-1.0.10.ebuild,v 1.1 2012/07/08 12:46:09 flameeyes Exp $
+
+EAPI=4
+
+USE_RUBY="ruby18 ruby19 ree18 jruby"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A small ruby library that allows it to 'tail' files in Ruby"
+HOMEPAGE="http://flori.github.com/file-tail"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/tins-0.4.3"
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+
+each_ruby_test() {
+ ruby-ng_testrb-2 -Ilib tests/*_test.rb
+}
diff --git a/dev-ruby/file-tail/file-tail-1.0.6.ebuild b/dev-ruby/file-tail/file-tail-1.0.6.ebuild
deleted file mode 100644
index 05098831470e..000000000000
--- a/dev-ruby/file-tail/file-tail-1.0.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/file-tail/file-tail-1.0.6.ebuild,v 1.1 2011/06/25 07:15:40 graaff Exp $
-
-EAPI=2
-USE_RUBY="ruby18 ree18 jruby"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A small ruby library that allows it to 'tail' files in Ruby"
-HOMEPAGE="http://flori.github.com/file-tail"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/spruz-0.2"
-ruby_add_bdepend "test? ( virtual/ruby-test-unit ) "
-
-all_ruby_prepare() {
- # sdoc is not yet available
- sed -i -e 's/sdoc/rdoc/' Rakefile || die
-}
-
-each_ruby_test() {
- ${RUBY} -Ilib tests/test_file-tail*.rb || die
-}
diff --git a/dev-ruby/gem_plugin/gem_plugin-0.2.3-r2.ebuild b/dev-ruby/gem_plugin/gem_plugin-0.2.3-r2.ebuild
index 70717ca045d4..3b201444ff1c 100644
--- a/dev-ruby/gem_plugin/gem_plugin-0.2.3-r2.ebuild
+++ b/dev-ruby/gem_plugin/gem_plugin-0.2.3-r2.ebuild
@@ -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/dev-ruby/gem_plugin/gem_plugin-0.2.3-r2.ebuild,v 1.2 2012/05/01 18:24:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gem_plugin/gem_plugin-0.2.3-r2.ebuild,v 1.3 2012/07/08 16:19:50 jer Exp $
EAPI="2"
USE_RUBY="ruby18 ruby19 jruby"
@@ -20,7 +20,7 @@ HOMEPAGE="http://mongrel.rubyforge.org/"
LICENSE="mongrel"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
each_fakegem_test() {
diff --git a/dev-ruby/gherkin/gherkin-2.7.3.ebuild b/dev-ruby/gherkin/gherkin-2.7.3.ebuild
index eb5d2847c49b..3c6c7e318884 100644
--- a/dev-ruby/gherkin/gherkin-2.7.3.ebuild
+++ b/dev-ruby/gherkin/gherkin-2.7.3.ebuild
@@ -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/dev-ruby/gherkin/gherkin-2.7.3.ebuild,v 1.2 2012/01/29 10:29:08 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/gherkin-2.7.3.ebuild,v 1.3 2012/07/08 16:38:11 jer Exp $
EAPI=4
USE_RUBY="ruby18 ruby19 ree18"
@@ -18,7 +18,7 @@ HOMEPAGE="http://wiki.github.com/aslakhellesoy/cucumber/gherkin"
LICENSE="MIT"
SRC_URI="https://github.com/cucumber/gherkin/tarball/v${PV} -> ${P}.tgz"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~hppa"
SLOT="0"
IUSE="doc test"
diff --git a/dev-ruby/hpricot/hpricot-0.8.6-r1.ebuild b/dev-ruby/hpricot/hpricot-0.8.6-r1.ebuild
index ac5c0842d297..405de08cfa25 100644
--- a/dev-ruby/hpricot/hpricot-0.8.6-r1.ebuild
+++ b/dev-ruby/hpricot/hpricot-0.8.6-r1.ebuild
@@ -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/dev-ruby/hpricot/hpricot-0.8.6-r1.ebuild,v 1.1 2012/02/25 13:12:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/hpricot-0.8.6-r1.ebuild,v 1.2 2012/07/08 16:23:37 jer Exp $
EAPI=4
@@ -16,7 +16,7 @@ HOMEPAGE="http://wiki.github.com/hpricot/hpricot"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
ruby_add_bdepend "dev-ruby/rake
diff --git a/dev-ruby/mustache/mustache-0.99.4-r1.ebuild b/dev-ruby/mustache/mustache-0.99.4-r1.ebuild
index 4c8e4af9acca..b3c6605726e3 100644
--- a/dev-ruby/mustache/mustache-0.99.4-r1.ebuild
+++ b/dev-ruby/mustache/mustache-0.99.4-r1.ebuild
@@ -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/dev-ruby/mustache/mustache-0.99.4-r1.ebuild,v 1.1 2012/01/14 07:13:49 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mustache/mustache-0.99.4-r1.ebuild,v 1.2 2012/07/08 16:24:31 jer Exp $
EAPI=2
@@ -18,7 +18,7 @@ HOMEPAGE="http://mustache.github.com/"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE=""
ruby_add_bdepend "doc? ( app-text/ronn )"
diff --git a/dev-ruby/origin/Manifest b/dev-ruby/origin/Manifest
index f79bc3b706fb..d958e0cefeba 100644
--- a/dev-ruby/origin/Manifest
+++ b/dev-ruby/origin/Manifest
@@ -1 +1 @@
-DIST origin-1.0.3.tar.gz 35461 SHA256 54f46e1ac5c974ec2428056f568aae830dd683eadee681c5bd5a4b3e55a2219f SHA512 fa9a3e953dd24f24275a4b349c31b3e967e095a517723a9187e43295e73cab087f3e2a085ce2fd70a04d291ada5003630c57fe50c09adfe1816523d2d7db0148 WHIRLPOOL bed00010379fe170597faecabf593b53c083ae24f8a3a503a1ae043839c890b368e30bde459f685f9f93f854b0841d717dbe577227a61f81c64c00438213ad82
+DIST origin-1.0.4.tar.gz 35516 SHA256 dead7775bb33ce1a90239086ef429c1e261da55125bcefe9ba8836b6ce51722f SHA512 87857815fa26163a556f9dc3897e901bedb56563549502e61aaed9e70d19f5cd4ece61aaab4dc89c2174431a29e72fea9a273b4e773e58a918cad12607d54822 WHIRLPOOL 623fce482ee426aac7d6e12f1627078a62aa296ef025d653ce2271f43b2e1bb991d1949fd43eda6e7fe79ce3ec13b6a439c22444015865fe6f3e6a0d287beb77
diff --git a/dev-ruby/origin/origin-1.0.3.ebuild b/dev-ruby/origin/origin-1.0.4.ebuild
similarity index 88%
rename from dev-ruby/origin/origin-1.0.3.ebuild
rename to dev-ruby/origin/origin-1.0.4.ebuild
index a789a56cd591..9d3f688d0e1f 100644
--- a/dev-ruby/origin/origin-1.0.3.ebuild
+++ b/dev-ruby/origin/origin-1.0.4.ebuild
@@ -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/dev-ruby/origin/origin-1.0.3.ebuild,v 1.2 2012/07/05 21:38:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/origin/origin-1.0.4.ebuild,v 1.1 2012/07/08 10:12:35 flameeyes Exp $
EAPI=4
diff --git a/dev-ruby/prawn-core/prawn-core-0.8.4-r2.ebuild b/dev-ruby/prawn-core/prawn-core-0.8.4-r2.ebuild
index 8cbee69dbe17..ad07b2b8fbba 100644
--- a/dev-ruby/prawn-core/prawn-core-0.8.4-r2.ebuild
+++ b/dev-ruby/prawn-core/prawn-core-0.8.4-r2.ebuild
@@ -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/dev-ruby/prawn-core/prawn-core-0.8.4-r2.ebuild,v 1.2 2012/03/02 13:02:38 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/prawn-core/prawn-core-0.8.4-r2.ebuild,v 1.4 2012/07/08 16:06:32 jer Exp $
EAPI=2
USE_RUBY="ruby18 ruby19 ree18 jruby"
@@ -20,19 +20,25 @@ HOMEPAGE="http://prawn.majesticseacreature.com/"
LICENSE="|| ( GPL-2 Ruby )"
SLOT="0"
-KEYWORDS="~amd64 ~x86-fbsd"
+KEYWORDS="~amd64 ~hppa ~x86-fbsd"
IUSE="examples"
ruby_add_bdepend test "dev-ruby/test-spec dev-ruby/mocha >=dev-ruby/pdf-reader-0.8"
-USE_RUBY="ruby19" ruby_add_bdepend "test? ( dev-ruby/test-unit:0 )"
-
# Older versions of prawn install the same files, but in site_ruby
# which gets found before the newer gem install path that prawn-core
# uses.
RDEPEND="! ${P}-git.tgz"
+RUBY_S="aussiegeek-rubyzip-*"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${DEPEND} test? ( app-arch/zip )"
+
+all_ruby_install() {
+ all_fakegem_install
+
+ docinto examples
+ dodoc samples/*
+}
diff --git a/dev-ruby/samuel/Manifest b/dev-ruby/samuel/Manifest
index 5ac882ef12b1..b26c165dab14 100644
--- a/dev-ruby/samuel/Manifest
+++ b/dev-ruby/samuel/Manifest
@@ -1 +1,2 @@
DIST samuel-0.3.2.gem 12800 SHA256 0c56f0c8166055da17dfc81cbcb0353bedc680792b266cfd481252b5de9a1d70 SHA512 698fd20b34edaaa1c7465844f0078f5bd2e9f656ae9301b0ce790d2761f85657b8b62b16b81517b5b02f127626fdfe158596a181513b55ad930e5bb8cd05f3c7 WHIRLPOOL bc19d76ea2cda6e0da15c188d473c763577970844383025e8e9a4448a95fd8c26b44f351814c89d937376a7395c6c76c9ba0803392c602063e78e82e28c4c0a0
+DIST samuel-0.3.3.gem 12800 SHA256 a0a566e27f654aff0af30f34d80153201619ba9fc5c80ac891c9719d2f84a048 SHA512 3c668a45ac6eb58d236722f1d9f23cfa02d54506309427ad4c6ee2909a6d3def109246c7f7f98a9c26cda0ac74b54c610c4cc0fc18110bf9b45d1aa461f37f57 WHIRLPOOL 9d90f09fd34c48b9213ddc15c1432d400c44e950f717da9ad536477d9bb3d6fddca6c5ab728bacfdc4f9cd0af983c4191cd952c0a5ff0bad403ff15366c6b151
diff --git a/dev-ruby/samuel/samuel-0.3.3.ebuild b/dev-ruby/samuel/samuel-0.3.3.ebuild
new file mode 100644
index 000000000000..bd0b90be69ba
--- /dev/null
+++ b/dev-ruby/samuel/samuel-0.3.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/samuel/samuel-0.3.3.ebuild,v 1.1 2012/07/08 11:11:08 flameeyes Exp $
+
+EAPI=4
+
+USE_RUBY="ruby18 ree18 ruby19 jruby"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="An automatic logger for HTTP requests in Ruby."
+HOMEPAGE="http://github.com/chrisk/samuel"
+
+LICENSE="as-is" # truly
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+ruby_add_bdepend "
+ test? (
+ >=dev-ruby/shoulda-2.11.3
+ >=dev-ruby/fakeweb-1.3
+ >=dev-ruby/httpclient-2.2.3
+ >=dev-ruby/mocha-0.10.0
+ virtual/ruby-test-unit
+ )"
+
+all_ruby_prepare() {
+ # Remove references to bundler
+ sed -i -e '/[Bb]undler/d' test/test_helper.rb || die
+ rm Gemfile*
+
+ # Change the default port from 8000 to 64888 to sidestep Issue #10.
+ # https://github.com/chrisk/samuel/issues/10
+ sed -i -e 's:8000:64888:g' test/*.rb || die
+}
diff --git a/dev-ruby/spork/spork-0.9.0.ebuild b/dev-ruby/spork/spork-0.9.0.ebuild
index f0725870ce75..888ec5726f08 100644
--- a/dev-ruby/spork/spork-0.9.0.ebuild
+++ b/dev-ruby/spork/spork-0.9.0.ebuild
@@ -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/dev-ruby/spork/spork-0.9.0.ebuild,v 1.3 2012/06/12 11:45:00 iksaif Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/spork/spork-0.9.0.ebuild,v 1.4 2012/07/08 16:08:11 jer Exp $
EAPI=2
@@ -16,7 +16,7 @@ DESCRIPTION="Spork is Tim Harper's implementation of test server."
HOMEPAGE="https://github.com/sporkrb/spork"
LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/spork/spork-0.9.2.ebuild b/dev-ruby/spork/spork-0.9.2.ebuild
index f2effa72b632..2cca116c4045 100644
--- a/dev-ruby/spork/spork-0.9.2.ebuild
+++ b/dev-ruby/spork/spork-0.9.2.ebuild
@@ -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/dev-ruby/spork/spork-0.9.2.ebuild,v 1.2 2012/06/12 11:45:00 iksaif Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/spork/spork-0.9.2.ebuild,v 1.3 2012/07/08 16:08:11 jer Exp $
EAPI=2
@@ -16,7 +16,7 @@ DESCRIPTION="Spork is Tim Harper's implementation of test server."
HOMEPAGE="https://github.com/sporkrb/spork"
LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/spruz/Manifest b/dev-ruby/spruz/Manifest
index a3cdd2e159ee..d72ebabaa3a2 100644
--- a/dev-ruby/spruz/Manifest
+++ b/dev-ruby/spruz/Manifest
@@ -1 +1 @@
-DIST spruz-0.2.11.gem 19968 SHA256 712adf1a9699b8c7fa6264236d892d58389da507ff5fbaba37df9c9ef6affd62 SHA512 4f30039b59c4903a04c2df391ff9acbb7ae7f3afd5dee5708d04f0e7e5bbc5f8cd50165df64489ccb50e47a51c131befaf032b83d1b60715283d8cde4fc956a1 WHIRLPOOL 355638d8515305e1caf6cf768a30fd4b9d2d442a58e8f70d4cbfe8231a058ada21500f9b9254e76260ab1e40bf2d93b3cbb9774d355d122be15a857418c780f3
+DIST spruz-0.2.13.gem 23552 SHA256 c195d5f7c4199f289c88687cfe3561b15367ec262a7767374eb2d969b9fe2e7a SHA512 544df856363e4d01b5bf7c37a5e92073e82a4b97607d0ca3e751353615a1321d0a4ade2ef503ab78e60491a12100e6b45d2ae3d1565d8fd91db47cffaf461629 WHIRLPOOL c212e6e3f2a767ce2f76b9f2458bac8a7e7f2de4a857a7a7a8c936402abe332c37301ade027f5eb75b149ee5595796310c4fe07ab8a09d544765061d2c66eab3
diff --git a/dev-ruby/spruz/spruz-0.2.11.ebuild b/dev-ruby/spruz/spruz-0.2.13.ebuild
similarity index 66%
rename from dev-ruby/spruz/spruz-0.2.11.ebuild
rename to dev-ruby/spruz/spruz-0.2.13.ebuild
index cc3d2888656d..f33f8b14e44c 100644
--- a/dev-ruby/spruz/spruz-0.2.11.ebuild
+++ b/dev-ruby/spruz/spruz-0.2.13.ebuild
@@ -1,13 +1,18 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/spruz/spruz-0.2.11.ebuild,v 1.5 2012/05/01 18:24:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/spruz/spruz-0.2.13.ebuild,v 1.1 2012/07/08 12:53:45 flameeyes Exp $
-EAPI=2
-USE_RUBY="ruby18 ree18 jruby"
+EAPI=4
+
+USE_RUBY="ruby18 ruby19 ree18 jruby"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
inherit ruby-fakegem
DESCRIPTION="All the stuff that isn't good enough for a real library."
@@ -18,7 +23,7 @@ SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
IUSE=""
-ruby_add_bdepend "test? ( virtual/ruby-test-unit ) "
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
all_ruby_prepare() {
# sdoc is not available for Gentoo yet, use rdoc instead
@@ -28,5 +33,5 @@ all_ruby_prepare() {
}
each_ruby_test() {
- ${RUBY} -Ilib -S testrb tests/* || die
+ ruby-ng_testrb-2 -Ilib tests/*_test.rb
}
diff --git a/dev-ruby/termcolor/Manifest b/dev-ruby/termcolor/Manifest
index 92e85b7f73df..a7430c39e73b 100644
--- a/dev-ruby/termcolor/Manifest
+++ b/dev-ruby/termcolor/Manifest
@@ -1 +1,2 @@
DIST termcolor-1.2.0.gem 6656 SHA256 30b9f7c0f1834c2043a80d7d739e8fcf14303bed0244cb56e3a4676608bf8b67 SHA512 2cac81f5219abc76ff32a032248c02be1e7990f69de7c719f6b11cf51ac95fcb61c4eafd8780b8ba6a607fbccf6b2d8ec35ff804f89563a1e20fb32add12dfa4 WHIRLPOOL e2a941b72b920da575ea67f3ff19d82e0df39a4298f582b6524088456e13430c42fcb9c890571cd9104dec3e46ff62a0c5ef6ddaf7e885040b7d3a2fdf45e5fd
+DIST termcolor-1.2.1.gem 6656 SHA256 d5e595a8d29380d76b44e5e3806766198da048095acc51072b388ea5439e1df3 SHA512 986fe5a5a56a83d9a39ce13cfe59a82850780befdbba006d2d0cf532b9bf2f72f1fe70363123c46b8beead5d8add452535189a069f2b2f3cf62f0b7611ec52ff WHIRLPOOL 3d12c46f22b53ec2df15d55673ebe78ad98248deabdb5adc655908774edf30f3ac90f5210bd994dd4997c8017a9e2e11d5a705ab3679ff689c9d3b9df702b865
diff --git a/dev-ruby/termcolor/termcolor-1.2.0.ebuild b/dev-ruby/termcolor/termcolor-1.2.0.ebuild
index 36fc5a9d97d8..b92f29ceaf4d 100644
--- a/dev-ruby/termcolor/termcolor-1.2.0.ebuild
+++ b/dev-ruby/termcolor/termcolor-1.2.0.ebuild
@@ -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/dev-ruby/termcolor/termcolor-1.2.0.ebuild,v 1.2 2011/11/20 09:30:50 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/termcolor/termcolor-1.2.0.ebuild,v 1.3 2012/07/08 21:46:13 naota Exp $
EAPI="2"
#*** Using highline effectively in JRuby requires manually installing the ffi-ncurses gem.
diff --git a/dev-ruby/termcolor/termcolor-1.2.1.ebuild b/dev-ruby/termcolor/termcolor-1.2.1.ebuild
new file mode 100644
index 000000000000..7b5f5b449d0e
--- /dev/null
+++ b/dev-ruby/termcolor/termcolor-1.2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/termcolor/termcolor-1.2.1.ebuild,v 1.1 2012/07/08 21:46:13 naota Exp $
+
+EAPI="2"
+#*** Using highline effectively in JRuby requires manually installing the ffi-ncurses gem.
+USE_RUBY="ruby18 ruby19 ree18"
+
+RUBY_FAKEGEM_TASK_TEST="spec"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="a library for ANSI color formatting like HTML for output in terminal"
+HOMEPAGE="http://termcolor.rubyforge.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "dev-ruby/rspec:0"
+ruby_add_rdepend ">=dev-ruby/highline-1.5.0"
+
+each_ruby_test() {
+ ${RUBY} -S spec spec || die
+}
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index 42e56a8cd1e2..4848d13a2595 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -1,4 +1,4 @@
DIST test-unit-1.2.3.gem 40960 SHA256 a7551459c53b0d73ac8e3ad3624b88d211bc80bc41a8c1a57c9d4b422beea4b7 SHA512 5e12a9691715a1e1afb53623867b77e2e06739929da5f0615c7341dc75f5feb281492bc0f6c55bdf1cc190f09a9a2c0f602638d5cad8a65682ba5f361bd22e57 WHIRLPOOL 2d459056aabf5804cc868d893060f6833570fbdd5c3d1d3fae09c2488909a55bdd340ab34297ac57298a03ff9c48a660705c1e28390e498aaef7ed40bf165205
DIST test-unit-2.1.2.gem 196608 SHA256 cd3ef4f121765c13a3a5c2ae7d316a2d575908b7ee6a157c2e584d05242cd329 SHA512 be917d33de96f1983c918108aac942685a647ece96f161a53f219cb68089cb784b0cd468b965c76b432f14edd1521378dedc3a6deb02c54e4e192efdfac5b3e4 WHIRLPOOL ea2021ba73edf53a2884cbe24e2a612b1d16e904ec2c79e0910c35790d201fae285db7dd55dfd4708c6dc76bc7ace237dceb2c8f647bfcd216d1f6e7bf5d095b
DIST test-unit-2.4.8.gem 96768 SHA256 6dff12a2b30ccaa094aeea74350b32a3ed8ea4eeeac2fef41848b81a6c6e481e SHA512 ecc2cb1487d023d7c035b89dc9745558382253f11b2fd381023e669ff4ebd1ce643fc45f270570fab43859970127088f00f01df601d295baafa3f032269eda53 WHIRLPOOL 86ee1b4fc76166a10f43a9385ecfb1223799490a88a9abbf30fdd228410a5fd78ab4f77b2198ebb3382776070717324a1921c39c81676a88830e2a69a09c92ca
-DIST test-unit-2.5.0.gem 97280 SHA256 64d1f8a3c3c7d55f664b94a3cdb0548bdfdebbf9a3d735260e1bf292b9b8217a SHA512 85403671bde6b59065c10b170884af59c975b7aae3f81f212d4614b578dd6e63b3ff6c660ff36c6282d62005a2425bc10f6db13a09dc705fbbda8024c8becd12 WHIRLPOOL 92a7e409c4d39b27a1d7415bd0b3571fcb452055591c2ce02b019f8e831b0c3370f54e039ba61f1219ac568c2ada6f64cd456f556718983b7cd72fdb39082230
+DIST test-unit-2.5.1.gem 99840 SHA256 e8e94050afff5bbfd3ee2bc03ebfece1625d9e97c6b76d46e4199ed1db65e3e8 SHA512 e24c5b85776faca7d130b73206d4c8df90551799bf090e95421fb61b9aefb1c1256a5c97a1c60c4bc7115418758685468f9b21d1a5ec318579c567228de81710 WHIRLPOOL f7623287a3ee456d0e3570851ab7226caf80762e6bf4f7ed20700c61533040d2ee8dc16e6bcfabe7e8002e4eb9b300e29e9eb3e50480b0811099ed94e34691dd
diff --git a/dev-ruby/test-unit/files/testrb b/dev-ruby/test-unit/files/testrb
new file mode 100644
index 000000000000..f87eabcb2bef
--- /dev/null
+++ b/dev-ruby/test-unit/files/testrb
@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+gem 'test-unit', '~> 2.5'
+require 'test/unit'
+(r = Test::Unit::AutoRunner.new(true)).process_args(ARGV) or
+ abort r.options.banner + " tests..."
+exit r.run
diff --git a/dev-ruby/test-unit/test-unit-2.5.0.ebuild b/dev-ruby/test-unit/test-unit-2.5.1-r1.ebuild
similarity index 70%
rename from dev-ruby/test-unit/test-unit-2.5.0.ebuild
rename to dev-ruby/test-unit/test-unit-2.5.1-r1.ebuild
index ef72fb7baa57..ada74c037c6a 100644
--- a/dev-ruby/test-unit/test-unit-2.5.0.ebuild
+++ b/dev-ruby/test-unit/test-unit-2.5.1-r1.ebuild
@@ -1,17 +1,14 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit/test-unit-2.5.0.ebuild,v 1.1 2012/06/10 05:59:07 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit/test-unit-2.5.1-r1.ebuild,v 1.1 2012/07/08 12:37:11 flameeyes Exp $
-EAPI=2
+EAPI=4
USE_RUBY="ruby18 ruby19 ree18 jruby"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_DOCDIR="doc"
RUBY_FAKEGEM_EXTRADOC="TODO README.textile"
-# Disable default binwraps
-RUBY_FAKEGEM_BINWRAP=""
-
inherit ruby-fakegem
ruby_add_bdepend "doc? ( dev-ruby/yard )"
@@ -19,9 +16,7 @@ ruby_add_bdepend "doc? ( dev-ruby/yard )"
# jruby. Since we build documentation with the main ruby implementation
# only we skip the dependency for jruby in this roundabout way, assuming
# that jruby won't be the main ruby.
-USE_RUBY=ruby18 ruby_add_bdepend "ruby_targets_ruby18 doc" "( dev-ruby/redcloth )"
-USE_RUBY=ruby19 ruby_add_bdepend "ruby_targets_ruby19 doc" "( dev-ruby/redcloth )"
-USE_RUBY=ree18 ruby_add_bdepend "ruby_targets_ree18 doc" "( dev-ruby/redcloth )"
+USE_RUBY="${USE_RUBY/jruby/}" ruby_add_bdepend "doc? ( dev-ruby/redcloth )"
DESCRIPTION="An improved version of the Test::Unit framework from Ruby 1.8"
HOMEPAGE="http://test-unit.rubyforge.org/"
@@ -45,7 +40,7 @@ each_ruby_test() {
# rake audit || die "rake audit failed"
local rubyflags
- [[ $(basename ${RUBY}) == jruby ]] && rubyflags="-X+O"
+ [[ ${RUBY} == */jruby ]] && rubyflags="-X+O"
${RUBY} ${rubyflags} test/run-test.rb || die "testsuite failed"
}
@@ -53,7 +48,5 @@ each_ruby_test() {
all_ruby_install() {
all_fakegem_install
- # Create a testrb2 wrapper similarly to the rdoc2 wrapper for
- # rdoc-2* series.
- ruby_fakegem_binwrapper testrb /usr/bin/testrb-2
+ newbin "${FILESDIR}"/testrb testrb-2
}
diff --git a/dev-ruby/tins/Manifest b/dev-ruby/tins/Manifest
index 7eebe21a29e9..42b0e3cda21b 100644
--- a/dev-ruby/tins/Manifest
+++ b/dev-ruby/tins/Manifest
@@ -1,3 +1,4 @@
DIST tins-0.3.14.gem 28160 SHA256 e30bb2a890a6f29a2cc522f4c27c6bfc3af5fb4db0fc3e5da9c086bf3afeb55b SHA512 cded23fbb5ffff89bea22e2deb9f178a5a87d99037c62144f5dca839a89fa808dffdf98a14e25353dd00e67231d1dd8155c8e7e0b8452c298a0dfc73f5098635 WHIRLPOOL 20053a2d03a0aac52c6335485d517e347ab601e41bbf7433dd19e416ffdab927c5d2ea18c99a4851c161d4ced38df43b68b3569029921e82e72ac1b2feb039c3
DIST tins-0.3.6.gem 25088 SHA256 1e946f3711f475bb960fc8de1532c061ae3dad78505aa9cbebec3b2398fbedc5 SHA512 e54a838c50692e5181c3ad7266226a1614ba8a3bd438bfc0c31072172b0a40ec48a887169cd6d3419ddd7bb6c594d1acb58bfcf066d8fe5dfd370d5b5ae90d4d WHIRLPOOL 912ef41ecf89cedc614345563b5aebde20d26cd9178186105c6418cee47320f151d328b92a77d5ff490899108352af388037e78b03242bd84c298eb603e800e7
DIST tins-0.3.7.gem 25088 SHA256 a8b2e7c6084535f1fc85d2b649e879151882447d7303d0cafce936caa7cdc4c8 SHA512 c51316042f4e33864d55481dd4f95a757629a6678f874af0004d7029e45e8c5a12b3523f91e6fd13df24297c1fbeab5e2e41731b4ba36655e7a8da2deed28d58 WHIRLPOOL 515cd71bc65c535e476102fc75f06b96dfc570d130327562262dd8019443db339f547b0c6b61323da5bda84acbf8fee7ff3e08a7252f566588234cfc6909d97b
+DIST tins-0.4.3.gem 27136 SHA256 5cf10c5110a76991f32a922bb8a80c1bfd924c819e483275658459a3416a4121 SHA512 a446ed044f924c492ccda86569503c177a39a589ce6e5d6c5f43121bcdcab70474f46d5a2bbad3e0f456f42c9f4abe205fdcb04ea0521af2c7fa25556ee40e74 WHIRLPOOL 297d6308c1c098d2ab7dfc99e1bd521f27960a6525ab48ea94217a48dc04625c5c02b214f803999258c33c931c1f30154cb23627c991f8500348a48576b5da22
diff --git a/dev-ruby/tins/files/tins-0.4.3-gentoo.patch b/dev-ruby/tins/files/tins-0.4.3-gentoo.patch
new file mode 100644
index 000000000000..1fae94eb6ab6
--- /dev/null
+++ b/dev-ruby/tins/files/tins-0.4.3-gentoo.patch
@@ -0,0 +1,30 @@
+diff --git a/tests/find_test.rb b/tests/find_test.rb
+index 63bc9c7..22df1e2 100644
+--- a/tests/find_test.rb
++++ b/tests/find_test.rb
+@@ -31,8 +31,13 @@ module Tins
+ assert_equal [ @work_dir, file ], find(@work_dir, :show_hidden => true).to_a
+ end
+
+- if RUBY_PLATFORM !~ /java/
+- def test_check_directory_without_access
++ def test_check_directory_without_access
++ # do not run this test on JRuby
++ omit_if(RUBY_PLATFORM =~ /java/, "Can't run the test on JRuby")
++ # do not run this test if we're root, as it will fail.
++ omit_if(Process::UID.eid == 0, "Can't run the test as root")
++
++ begin
+ mkdir_p directory1 = File.join(@work_dir, 'foo')
+ mkdir_p directory2 = File.join(directory1, 'bar')
+ touch file = File.join(directory2, 'file')
+diff --git a/tests/test_helper.rb b/tests/test_helper.rb
+index e56071a..fbb1635 100644
+--- a/tests/test_helper.rb
++++ b/tests/test_helper.rb
+@@ -4,4 +4,5 @@ if ENV['START_SIMPLECOV'].to_i == 1
+ add_filter "#{File.basename(File.dirname(__FILE__))}/"
+ end
+ end
++gem 'test-unit', '~> 2.4'
+ require 'test/unit'
diff --git a/dev-ruby/tins/tins-0.4.3.ebuild b/dev-ruby/tins/tins-0.4.3.ebuild
new file mode 100644
index 000000000000..1456ed9a46f1
--- /dev/null
+++ b/dev-ruby/tins/tins-0.4.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tins/tins-0.4.3.ebuild,v 1.1 2012/07/08 12:44:55 flameeyes Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ruby19 ree18 jruby"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="All the stuff that isn't good enough for a real library."
+HOMEPAGE="http://github.com/flori/tins"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 ) "
+
+RUBY_PATCHES=( "${P}-gentoo.patch" )
+
+each_ruby_test() {
+ ruby-ng_testrb-2 -Ilib tests/*_test.rb
+}
diff --git a/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-gpd.diff b/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-gpd.diff
deleted file mode 100644
index 8b881af79899..000000000000
--- a/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-gpd.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- Gauche-cdb-0.3.1.orig/configure.ac
-+++ Gauche-cdb-0.3.1/configure.ac
-@@ -16,6 +16,7 @@
- AC_LIB_LINKFLAGS(cdb)
-
- AC_GAUCHE_FIX_LIBS
-
-+AC_GAUCHE_MAKE_GPD
- echo $PACKAGE_VERSION > VERSION
- AC_OUTPUT(Makefile)
diff --git a/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-segv.diff b/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-segv.diff
deleted file mode 100644
index c4b964dd73cb..000000000000
--- a/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-segv.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- Gauche-cdb-0.3.1.orig/cdb.stub
-+++ Gauche-cdb-0.3.1/cdb.stub
-@@ -69,7 +69,7 @@
-
- static void cdb_finalize(ScmObj obj, void *data)
- {
-- ScmCdb *cdb = SCM_CDB(cdb);
-+ ScmCdb *cdb = SCM_CDB(obj);
- switch (cdb->status) {
- case OPEN_QUERY:
- cdb_free(&cdb->cdb); close(cdb_fileno(&cdb->cdb));
diff --git a/dev-scheme/gauche-cdb/gauche-cdb-0.3.1-r1.ebuild b/dev-scheme/gauche-cdb/gauche-cdb-0.3.1-r1.ebuild
index 1c4461038602..044b12c0c2fe 100644
--- a/dev-scheme/gauche-cdb/gauche-cdb-0.3.1-r1.ebuild
+++ b/dev-scheme/gauche-cdb/gauche-cdb-0.3.1-r1.ebuild
@@ -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/dev-scheme/gauche-cdb/gauche-cdb-0.3.1-r1.ebuild,v 1.2 2012/07/07 14:34:32 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gauche-cdb/gauche-cdb-0.3.1-r1.ebuild,v 1.3 2012/07/08 06:58:56 hattya Exp $
EAPI="4"
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge.jp/gauche/8407/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~ia64 x86"
+KEYWORDS="ia64 x86"
IUSE=""
RDEPEND="dev-scheme/gauche
diff --git a/dev-scheme/gauche-cdb/gauche-cdb-0.3.1.ebuild b/dev-scheme/gauche-cdb/gauche-cdb-0.3.1.ebuild
deleted file mode 100644
index 3be94bedb3c6..000000000000
--- a/dev-scheme/gauche-cdb/gauche-cdb-0.3.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gauche-cdb/gauche-cdb-0.3.1.ebuild,v 1.13 2012/07/07 14:34:32 hattya Exp $
-
-EAPI="4"
-
-inherit autotools eutils
-
-MY_P="${P/g/G}"
-
-DESCRIPTION="CDB binding for Gauche"
-HOMEPAGE="http://sourceforge.jp/projects/gauche/"
-SRC_URI="mirror://sourceforge.jp/gauche/8407/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="ia64 x86"
-IUSE=""
-
-RDEPEND="dev-scheme/gauche
- dev-db/tinycdb"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gpd.diff
- epatch "${FILESDIR}"/${P}-segv.diff
- eautoreconf
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc README
-
- insinto "$(gauche-config --sitelibdir)/.packages"
- doins ${MY_P%-*}.gpd
-}
diff --git a/dev-scheme/gauche/gauche-0.9.2.ebuild b/dev-scheme/gauche/gauche-0.9.2.ebuild
index 9c8087191ee4..662ca06e8878 100644
--- a/dev-scheme/gauche/gauche-0.9.2.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.2.ebuild
@@ -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/dev-scheme/gauche/gauche-0.9.2.ebuild,v 1.3 2012/05/26 10:31:16 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gauche/gauche-0.9.2.ebuild,v 1.4 2012/07/08 08:46:58 hattya Exp $
EAPI="4"
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/gauche/${MY_P}.tgz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="ipv6"
RDEPEND="sys-libs/gdbm"
diff --git a/dev-scheme/gauche/gauche-0.9.3.3.ebuild b/dev-scheme/gauche/gauche-0.9.3.3.ebuild
index 201a5d3b8c5c..ac37d64e0c1c 100644
--- a/dev-scheme/gauche/gauche-0.9.3.3.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.3.3.ebuild
@@ -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/dev-scheme/gauche/gauche-0.9.3.3.ebuild,v 1.2 2012/06/03 08:17:22 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gauche/gauche-0.9.3.3.ebuild,v 1.3 2012/07/08 08:46:58 hattya Exp $
EAPI="4"
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/gauche/${MY_P}.tgz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="ipv6 test"
RDEPEND="sys-libs/gdbm"
diff --git a/dev-tex/latex-beamer/Manifest b/dev-tex/latex-beamer/Manifest
index 84430dcc0b54..dcc76ec69b80 100644
--- a/dev-tex/latex-beamer/Manifest
+++ b/dev-tex/latex-beamer/Manifest
@@ -1,5 +1,2 @@
-DIST latex-beamer-3.11.zip 2881467 SHA256 9b36a8b4c1493344d66ef1058aa25f8b99ab616d9353d541d1f4100f16fdf260 SHA512 ae1bbc27ff5de4277c3b1e0aea4344df2806e8302d78fcd0aa867be0f7b2fa112c5e9658c85c04b5564e0a75a323b08789ed32a12a9dcd9c79f90bad1bd0c58a WHIRLPOOL e241049be79439254b253e2af1c2e6cfef664cd63cc07d864039e5c7df5804cb61d54d35bb3559618054669b5b65f74672bb1996a675901d2fdc7cd3a044729a
DIST latex-beamer-3.16.zip 4259922 SHA256 07837fcaa783a1d0452ba39e03f272c52e6d73f6d9f40f5ca3094116fbabe6ab SHA512 fad7bf7928e5436bf68c3604d9be9522f4281bbaa0cab6e5b71bb968c6083146744c43fa99b91f135d210841a43b7346e59469afdb93622e7bd60be9c7c04531 WHIRLPOOL 3cc5a839cc6c2b587fc58d9e71afa3fd907212f2875afa91b2d62ffce32fb36805a5acbd6ac6f4394ae4bf238921f505d8f820c157f26f7573b0ad23ed1ba005
-DIST latex-beamer-3.17.zip 4260916 SHA256 2af9a33f6e3b860dbfa11ec21f02f8922b2f75a41da97a054fe469b389ee0824 SHA512 1f0d270542533652ce0db2d209ab1ebb20368ef1a88baea8531442b69713431b10bde0fa7c4d506c3dcd8596222df99ddf1301cacff429fc1effc0b8e84658b9 WHIRLPOOL 772ab01f0e0d4ee80bd0d3b2550c335c4cfe745a84baeb930077b7501a18315f33e361d0c759a2dc6051ad9340bff18c45143924868c7ee8d8efe8006be3203c
-DIST latex-beamer-3.19.zip 4343622 SHA256 c843260552c136b0f9bb782bccbf92acbef4681e7fe8b7655d90c9e6fa921ec7 SHA512 3da3f55fae1891b7aa7ba8231b7ea332c52085a8c6669fe5eb74f23cfc0d75259799ab7e1594e18a0cfe622cba1bcd0752d5d5eaa710dc407eaace507e45a48f WHIRLPOOL 506e2ae9afb7a7a20d2b05389ade356b4010d147690b2d43c097d4f0013ad30dcaffdc6c33057a1b0ad1df8b6f6f3ff78080ab54709a7bd1c74fd01dc686575f
DIST latex-beamer-3.20.zip 4344917 SHA256 6ee74eaf2477071b4704d296056b6e5bf066c9a2a66c5d7f864023d7b1d9f255 SHA512 4587e13e9a6d70217b3a2a2a9a77bc88d2c0ad7caaa064f9035d1aeec3b506ef4396fa21b6af5e6054f84090dd145862bd842b4da14b320fc909e76b708375ec WHIRLPOOL 7798392f99a13080f39dcb89c862d9e29d041a76f325b9700d3bdef5b83658f9794327a8d5cd2c615261e67c74f2e394c9b28f747edee3b6f8aac632d3663dfa
diff --git a/dev-tex/latex-beamer/latex-beamer-3.11.ebuild b/dev-tex/latex-beamer/latex-beamer-3.11.ebuild
deleted file mode 100644
index a4114433562b..000000000000
--- a/dev-tex/latex-beamer/latex-beamer-3.11.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex-beamer/latex-beamer-3.11.ebuild,v 1.9 2012/03/08 21:18:16 ranger Exp $
-
-EAPI=4
-
-inherit latex-package
-
-DESCRIPTION="LaTeX class for creating presentations using a video projector"
-HOMEPAGE="http://bitbucket.org/rivanvx/beamer/wiki/Home"
-SRC_URI="http://dev.gentoo.org/~radhermit/distfiles/${P}.zip"
-
-LICENSE="GPL-2 FDL-1.2 LPPL-1.3c"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="doc examples lyx"
-
-DEPEND="app-arch/unzip
- lyx? ( app-office/lyx )
- dev-texlive/texlive-latex"
-RDEPEND=">=dev-tex/pgf-1.10
- !dev-tex/translator"
-
-S=${WORKDIR}/beamer
-
-src_install() {
- insinto /usr/share/texmf-site/tex/latex/beamer
- doins -r base
-
- if use lyx ; then
- insinto /usr/share/lyx/examples
- doins examples/lyx-based-presentation/*
- fi
-
- dodoc AUTHORS ChangeLog README TODO doc/licenses/LICENSE
-
- if use doc ; then
- docinto doc
- dodoc -r doc/*
- fi
-
- if use examples ; then
- rm -f "${S}"/examples/a-lecture/{*.tex~,._beamerexample-lecture-pic*}
- if ! use lyx ; then
- einfo "Removing lyx examples as lyx useflag is not set"
- find "${S}" -name "*.lyx" -print -delete
- fi
- dodoc -r examples solutions
- fi
-}
diff --git a/dev-tex/latex-beamer/latex-beamer-3.17.ebuild b/dev-tex/latex-beamer/latex-beamer-3.17.ebuild
deleted file mode 100644
index 9d3f233ef916..000000000000
--- a/dev-tex/latex-beamer/latex-beamer-3.17.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex-beamer/latex-beamer-3.17.ebuild,v 1.1 2012/05/10 07:49:13 radhermit Exp $
-
-EAPI=4
-
-inherit latex-package
-
-DESCRIPTION="LaTeX class for creating presentations using a video projector"
-HOMEPAGE="http://bitbucket.org/rivanvx/beamer/wiki/Home"
-SRC_URI="http://dev.gentoo.org/~radhermit/distfiles/${P}.zip"
-
-LICENSE="GPL-2 FDL-1.2 LPPL-1.3c"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples lyx"
-
-DEPEND="app-arch/unzip
- lyx? ( app-office/lyx )
- dev-texlive/texlive-latex"
-RDEPEND=">=dev-tex/pgf-1.10
- dev-tex/xcolor
- !dev-tex/translator"
-
-S=${WORKDIR}/beamer
-
-src_install() {
- insinto /usr/share/texmf-site/tex/latex/beamer
- doins -r base
-
- if use lyx ; then
- insinto /usr/share/lyx/examples
- doins examples/lyx-based-presentation/*
- fi
-
- dodoc AUTHORS ChangeLog README TODO doc/licenses/LICENSE
-
- if use doc ; then
- docinto doc
- dodoc -r doc/*
- fi
-
- if use examples ; then
- rm -f "${S}"/examples/a-lecture/{*.tex~,._beamerexample-lecture-pic*}
- if ! use lyx ; then
- einfo "Removing lyx examples as lyx useflag is not set"
- find "${S}" -name "*.lyx" -print -delete
- fi
- dodoc -r examples solutions
- fi
-}
diff --git a/dev-tex/latex-beamer/latex-beamer-3.19.ebuild b/dev-tex/latex-beamer/latex-beamer-3.19.ebuild
deleted file mode 100644
index a85eb587a532..000000000000
--- a/dev-tex/latex-beamer/latex-beamer-3.19.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex-beamer/latex-beamer-3.19.ebuild,v 1.1 2012/05/23 06:47:57 radhermit Exp $
-
-EAPI=4
-
-inherit latex-package
-
-DESCRIPTION="LaTeX class for creating presentations using a video projector"
-HOMEPAGE="http://bitbucket.org/rivanvx/beamer/wiki/Home"
-SRC_URI="http://dev.gentoo.org/~radhermit/distfiles/${P}.zip"
-
-LICENSE="GPL-2 FDL-1.2 LPPL-1.3c"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples lyx"
-
-DEPEND="app-arch/unzip
- lyx? ( app-office/lyx )
- dev-texlive/texlive-latex"
-RDEPEND=">=dev-tex/pgf-1.10
- dev-tex/xcolor
- !dev-tex/translator"
-
-S=${WORKDIR}/beamer
-
-src_install() {
- insinto /usr/share/texmf-site/tex/latex/beamer
- doins -r base
-
- if use lyx ; then
- insinto /usr/share/lyx/examples
- doins examples/lyx-based-presentation/*
- fi
-
- dodoc AUTHORS ChangeLog README TODO doc/licenses/LICENSE
-
- if use doc ; then
- docinto doc
- dodoc -r doc/*
- fi
-
- if use examples ; then
- rm -f "${S}"/examples/a-lecture/{*.tex~,._beamerexample-lecture-pic*}
- if ! use lyx ; then
- einfo "Removing lyx examples as lyx useflag is not set"
- find "${S}" -name "*.lyx" -print -delete
- fi
- dodoc -r examples solutions
- fi
-}
diff --git a/dev-tex/latex-beamer/latex-beamer-3.20.ebuild b/dev-tex/latex-beamer/latex-beamer-3.20.ebuild
index c2fb12cb18ec..313b48d7e307 100644
--- a/dev-tex/latex-beamer/latex-beamer-3.20.ebuild
+++ b/dev-tex/latex-beamer/latex-beamer-3.20.ebuild
@@ -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/dev-tex/latex-beamer/latex-beamer-3.20.ebuild,v 1.1 2012/06/07 05:03:23 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex-beamer/latex-beamer-3.20.ebuild,v 1.2 2012/07/08 23:30:11 jdhore Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="http://dev.gentoo.org/~radhermit/dist/${P}.zip"
LICENSE="GPL-2 FDL-1.2 LPPL-1.3c"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc examples lyx"
DEPEND="app-arch/unzip
diff --git a/dev-util/aruba/aruba-0.4.11.ebuild b/dev-util/aruba/aruba-0.4.11.ebuild
index 9f4505201d7e..9bd00897ac65 100644
--- a/dev-util/aruba/aruba-0.4.11.ebuild
+++ b/dev-util/aruba/aruba-0.4.11.ebuild
@@ -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/dev-util/aruba/aruba-0.4.11.ebuild,v 1.3 2012/06/12 11:47:54 iksaif Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/aruba/aruba-0.4.11.ebuild,v 1.4 2012/07/08 16:34:47 jer Exp $
EAPI=4
USE_RUBY="ruby18 ruby19 ree18"
@@ -17,7 +17,7 @@ DESCRIPTION="Cucumber steps for driving out command line applications."
HOMEPAGE="https://github.com/cucumber/aruba"
LICENSE="MIT"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~hppa"
SLOT="0"
IUSE=""
diff --git a/dev-util/boost-build/metadata.xml b/dev-util/boost-build/metadata.xml
index 5b304b7c411f..94ef4ee48b78 100644
--- a/dev-util/boost-build/metadata.xml
+++ b/dev-util/boost-build/metadata.xml
@@ -14,4 +14,8 @@
hwoarang@gentoo.org
Markos Chandras
+
+ arfrever.fta@gmail.com
+ Arfrever Frehtes Taifersar Arahesis
+
diff --git a/dev-util/catalyst/catalyst-2.0.8.1-r2.ebuild b/dev-util/catalyst/catalyst-2.0.8.1-r2.ebuild
new file mode 100644
index 000000000000..815fe0713d3c
--- /dev/null
+++ b/dev-util/catalyst/catalyst-2.0.8.1-r2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.8.1-r2.ebuild,v 1.1 2012/07/08 16:19:56 armin76 Exp $
+
+# catalyst-9999 -> latest Git
+# catalyst-2.9999 -> catalyst_2 branch from Git
+# catalyst-VER -> normal catalyst release
+
+EAPI=3
+PYTHON_DEPEND="2"
+
+if [[ ${PV} == 9999* || ${PV} == 2.9999* ]]; then
+ EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"
+ inherit git-2
+ SRC_URI=""
+ S="${WORKDIR}/${PN}"
+ KEYWORDS=""
+else
+ SRC_URI="mirror://gentoo/${P}.tar.bz2
+ http://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2"
+ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+fi
+inherit eutils multilib python
+
+DESCRIPTION="release metatool used for creating releases based on Gentoo Linux"
+HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT=""
+IUSE="ccache kernel_linux"
+
+DEPEND="app-text/asciidoc"
+RDEPEND="app-crypt/shash
+ virtual/cdrtools
+ ccache? ( dev-util/ccache )
+ ia64? ( sys-fs/dosfstools )
+ kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )"
+
+pkg_setup() {
+ if use ccache ; then
+ einfo "Enabling ccache support for catalyst."
+ else
+ ewarn "By default, ccache support for catalyst is disabled."
+ ewarn "If this is not what you intended,"
+ ewarn "then you should add ccache to your USE."
+ fi
+ echo
+ einfo "The template spec files are now installed by default. You can find"
+ einfo "them under /usr/share/doc/${PF}/examples"
+ einfo "and they are considered to be the authorative source of information"
+ einfo "on catalyst."
+ echo
+ if [[ ${PV} == 9999* || ${PV} == 2.9999* ]]; then
+ ewarn "The ${EGIT_BRANCH:-master} branch (what you get with this ${PV} ebuild) contains"
+ ewarn "work-in-progress code. Be aware that it's likely that it will not"
+ ewarn "be in a working state at any given point. Please do not file bugs"
+ ewarn "until you have posted on the gentoo-catalyst mailing list and we"
+ ewarn "have asked you to do so."
+ fi
+ python_set_active_version 2
+}
+
+src_prepare() {
+ python_convert_shebangs 2 catalyst modules/catalyst_lock.py
+
+ epatch "${FILESDIR}"/${PV}-arm-softfp.patch
+}
+
+src_install() {
+ insinto /usr/$(get_libdir)/${PN}
+ exeinto /usr/$(get_libdir)/${PN}
+ doexe catalyst || die "copying catalyst"
+ if [[ ${PV} == 9999* ]]; then
+ doins -r modules files || die "copying files"
+ else
+ doins -r arch modules livecd || die "copying files"
+ fi
+ for x in targets/*; do
+ exeinto /usr/$(get_libdir)/${PN}/$x
+ doexe $x/* || die "copying ${x}"
+ done
+ make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst
+ insinto /etc/catalyst
+ doins files/catalyst.conf files/catalystrc || die "copying configuration"
+ insinto /usr/share/doc/${PF}/examples
+ doins examples/* || die
+ dodoc README ChangeLog AUTHORS
+ doman files/catalyst.1
+ # Here is where we actually enable ccache
+ use ccache && \
+ dosed 's:options="autoresume kern:options="autoresume ccache kern:' \
+ /etc/catalyst/catalyst.conf
+ dosed "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
+ /etc/catalyst/catalyst.conf
+}
+
+pkg_postinst() {
+ einfo "You can find more information about catalyst by checking out the"
+ einfo "catalyst project page at:"
+ einfo "http://www.gentoo.org/proj/en/releng/catalyst/index.xml"
+ echo
+}
diff --git a/dev-util/catalyst/files/2.0.8.1-arm-softfp.patch b/dev-util/catalyst/files/2.0.8.1-arm-softfp.patch
new file mode 100644
index 000000000000..51ae1e718740
--- /dev/null
+++ b/dev-util/catalyst/files/2.0.8.1-arm-softfp.patch
@@ -0,0 +1,36 @@
+diff -ur catalyst-2.0.8.1.orig//arch/arm.py catalyst-2.0.8.1/arch/arm.py
+--- catalyst-2.0.8.1.orig//arch/arm.py 2012-07-07 20:28:46.788719269 +0200
++++ catalyst-2.0.8.1/arch/arm.py 2012-07-07 20:29:28.099721112 +0200
+@@ -67,28 +67,28 @@
+ "Builder class for armv6j target"
+ def __init__(self,myspec):
+ generic_arm.__init__(self,myspec)
+- self.settings["CHOST"]="armv6j-unknown-linux-gnueabi"
++ self.settings["CHOST"]="armv6j-softfp-linux-gnueabi"
+ self.settings["CFLAGS"]+=" -march=armv6j -mfpu=vfp -mfloat-abi=softfp"
+
+ class arch_armv6z(generic_arm):
+ "Builder class for armv6z target"
+ def __init__(self,myspec):
+ generic_arm.__init__(self,myspec)
+- self.settings["CHOST"]="armv6z-unknown-linux-gnueabi"
++ self.settings["CHOST"]="armv6z-softfp-linux-gnueabi"
+ self.settings["CFLAGS"]+=" -march=armv6z -mfpu=vfp -mfloat-abi=softfp"
+
+ class arch_armv6zk(generic_arm):
+ "Builder class for armv6zk target"
+ def __init__(self,myspec):
+ generic_arm.__init__(self,myspec)
+- self.settings["CHOST"]="armv6zk-unknown-linux-gnueabi"
++ self.settings["CHOST"]="armv6zk-softfp-linux-gnueabi"
+ self.settings["CFLAGS"]+=" -march=armv6zk -mfpu=vfp -mfloat-abi=softfp"
+
+ class arch_armv7a(generic_arm):
+ "Builder class for armv7a target"
+ def __init__(self,myspec):
+ generic_arm.__init__(self,myspec)
+- self.settings["CHOST"]="armv7a-unknown-linux-gnueabi"
++ self.settings["CHOST"]="armv7a-softfp-linux-gnueabi"
+ self.settings["CFLAGS"]+=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp"
+
+ class arch_armv6j_hardfp(generic_arm):
\ No newline at end of file
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 7469a0237f22..b7ee13bb54fb 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,3 +1,2 @@
-DIST cmake-2.8.6.tar.gz 5583905 SHA256 e6999b81ac367d85ffb0f69b6c4a0ef96f95dc154efd3592f9cfebacdf75728e SHA512 68e097a95dc4184248ddc4e3f5f3513c2082c576a89ab8bcd45edc0abde5c256f2b0215535787662f49d006de39b46e2251ab989914e4b18176730e10ff9be3e WHIRLPOOL 87dd2500ef2c8fd1f510b918892fccfd024653d1c8b113b5765ae4d2312b98445d94ae5215501c312a54548a1f658902cd8d1beeda91ae123d426a06565f9ebe
DIST cmake-2.8.7.tar.gz 5667409 SHA256 130923053d8fe1a2ae032a3f09021f9024bf29d7a04ed10ae04647ff00ecf59f SHA512 2b48bd922a2fcd7569e610c823cbaa061178b112e045de2c97da5fd9591224ebb211e2e8688af0eb140d9762e87fa5e41d1324a80c57a933870a801914ba6431 WHIRLPOOL 2da491bf1c44eff57ca71c038e054a781d3cfdd7bd42219b26f18524e994019812c95c07c881734db57e8ce31f5af5d1df238e2f0c4676b559f9caa89db2f169
DIST cmake-2.8.8.tar.gz 5691656 SHA256 2b59897864d6220ff20aa8eac64cac8994e004898a1c0f899c8cb4d7b7570b46 SHA512 db31b1335c9964504a080a665c9e23010e081e973ba948b2d55a5adff76183271677c94830f2b604b06337df110eec29a8e8749795576c662c0b2f50fe69c882 WHIRLPOOL 2d0f388de643801cf2f389e9a84d218f09be28226e9b2e11d4a1f60222e3dfdd861b603f919b4b321c926612035944a4903ba4efd1d5397ae56068bfef40e6bd
diff --git a/dev-util/cmake/cmake-2.8.6-r4.ebuild b/dev-util/cmake/cmake-2.8.6-r4.ebuild
deleted file mode 100644
index 62df8f133ec3..000000000000
--- a/dev-util/cmake/cmake-2.8.6-r4.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.6-r4.ebuild,v 1.10 2012/07/03 13:41:21 kensington Exp $
-
-EAPI=4
-
-CMAKE_REMOVE_MODULES="no"
-inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils virtualx
-
-MY_P="${PN}-$(replace_version_separator 3 - ${MY_PV})"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="emacs ncurses qt4 vim-syntax"
-
-DEPEND="
- >=app-arch/libarchive-2.8.0
- >=net-misc/curl-7.20.0-r1[ssl]
- >=dev-libs/expat-2.0.1
- virtual/pkgconfig
- sys-libs/zlib
- ncurses? ( sys-libs/ncurses )
- qt4? ( x11-libs/qt-gui:4 )
-"
-RDEPEND="${DEPEND}
- emacs? ( virtual/emacs )
- vim-syntax? (
- || (
- app-editors/vim
- app-editors/gvim
- )
- )
-"
-
-# bug 390533
-RESTRICT="test"
-
-SITEFILE="50${PN}-gentoo.el"
-VIMFILE="${PN}.vim"
-
-S="${WORKDIR}/${MY_P}"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-# Fixme:
-# Boost patchset is foobared and should respect eselect / slotting
-PATCHES=(
- "${FILESDIR}"/${PN}-2.6.3-darwin-bundle.patch
- "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
- "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
- "${FILESDIR}"/${PN}-2.8.0-darwin-default-install_name.patch
- "${FILESDIR}"/${PN}-2.8.1-libform.patch
- "${FILESDIR}"/${PN}-2.8.4-FindPythonLibs.patch
- "${FILESDIR}"/${PN}-2.8.3-more-no_host_paths.patch
- "${FILESDIR}"/${PN}-2.8.3-ruby_libname.patch
- "${FILESDIR}"/${PN}-2.8.4-FindBoost.patch
- "${FILESDIR}"/${PN}-2.8.6-FindBLAS-2.patch
- "${FILESDIR}"/${PN}-2.8.6-FindLAPACK-2.patch
- "${FILESDIR}"/${PN}-2.8.6-CodeBlocks.patch
- "${FILESDIR}"/${PN}-2.8.6-testsvn17.patch
-)
-cmake_src_bootstrap() {
- # Cleanup args to extract only JOBS.
- # Because bootstrap does not know anything else.
- echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
- if [ $? -eq 0 ]; then
- par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | egrep -o '[[:digit:]]+')
- par_arg="--parallel=${par_arg}"
- else
- par_arg="--parallel=1"
- fi
-
- tc-export CC CXX LD
-
- ./bootstrap \
- --prefix="${T}/cmakestrap/" \
- ${par_arg} \
- || die "Bootstrap failed"
-}
-
-cmake_src_test() {
- # fix OutDir test
- # this is altered thanks to our eclass
- sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die
-
- pushd "${CMAKE_BUILD_DIR}" > /dev/null
-
- local ctestargs
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
- # Excluded tests:
- # BootstrapTest: we actualy bootstrap it every time so why test it.
- # SimpleCOnly_sdcc: sdcc choke on global cflags so just skip the test
- # as it was never intended to be used this way.
- "${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \
- -E BootstrapTest SimpleCOnly_sdcc \
- || die "Tests failed"
-
- popd > /dev/null
-}
-
-pkg_setup() {
- einfo "Fixing java access violations ..."
- # bug 387227
- addpredict /proc/self/coredump_filter
-}
-
-src_prepare() {
- base_src_prepare
-
- # disable running of cmake in boostrap command
- sed -i \
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
- bootstrap || die "sed failed"
-
- # Add gcc libs to the default link paths
- sed -i \
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
- cmake_src_bootstrap
-}
-
-src_configure() {
- # make things work with gentoo java setup
- # in case java-config cannot be run, the variable just becomes unset
- # per bug #315229
- export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
-
- local mycmakeargs=(
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
- -DCMAKE_DOC_DIR=/share/doc/${PF}
- -DCMAKE_MAN_DIR=/share/man
- -DCMAKE_DATA_DIR=/share/${PN}
- $(cmake-utils_use_build ncurses CursesDialog)
- $(cmake-utils_use_build qt4 QtDialog)
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use emacs && elisp-compile Docs/cmake-mode.el
-}
-
-src_test() {
- VIRTUALX_COMMAND="cmake_src_test" virtualmake
-}
-
-src_install() {
- cmake-utils_src_install
- if use emacs; then
- elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins Docs/cmake-syntax.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Docs/cmake-indent.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${VIMFILE}"
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/cmake-2.8.7-r5.ebuild b/dev-util/cmake/cmake-2.8.7-r5.ebuild
index d337f4d1d8dd..72ff522e4fb9 100644
--- a/dev-util/cmake/cmake-2.8.7-r5.ebuild
+++ b/dev-util/cmake/cmake-2.8.7-r5.ebuild
@@ -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/dev-util/cmake/cmake-2.8.7-r5.ebuild,v 1.10 2012/07/03 13:41:21 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.7-r5.ebuild,v 1.11 2012/07/08 18:16:13 armin76 Exp $
EAPI=4
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.cmake.org/"
SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
LICENSE="CMake"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE="emacs ncurses qt4 vim-syntax"
diff --git a/dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch b/dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch
deleted file mode 100644
index 45d2b162c5b7..000000000000
--- a/dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN cmake-2.8.3.orig//Modules/FindRuby.cmake cmake-2.8.3//Modules/FindRuby.cmake
---- cmake-2.8.3.orig//Modules/FindRuby.cmake 2010-12-25 16:56:42.597163498 +0100
-+++ cmake-2.8.3//Modules/FindRuby.cmake 2010-12-25 16:57:55.207163499 +0100
-@@ -180,7 +180,7 @@
-
-
- # Determine the list of possible names for the ruby library
--SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT})
-+SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} ruby${_RUBY_VERSION_SHORT_NODOT})
-
- IF(WIN32)
- SET( _RUBY_MSVC_RUNTIME "" )
diff --git a/dev-util/cmake/files/cmake-2.8.6-CodeBlocks.patch b/dev-util/cmake/files/cmake-2.8.6-CodeBlocks.patch
deleted file mode 100644
index 8a8fe6f392a8..000000000000
--- a/dev-util/cmake/files/cmake-2.8.6-CodeBlocks.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 240d39a6a4f72fe0e45fc1a1403e0b578d36a142 Mon Sep 17 00:00:00 2001
-From: Clinton Stimpson
-Date: Wed, 5 Oct 2011 10:02:32 -0600
-Subject: [PATCH] Fix XML safety issue with adding preprocessor defines in CodeBlocks project.
-
----
- Source/cmExtraCodeBlocksGenerator.cxx | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
-index 7db91c7..9a0b1ea 100644
---- a/Source/cmExtraCodeBlocksGenerator.cxx
-+++ b/Source/cmExtraCodeBlocksGenerator.cxx
-@@ -19,6 +19,7 @@
- #include "cmGeneratedFileStream.h"
- #include "cmTarget.h"
- #include "cmSystemTools.h"
-+#include "cmXMLSafe.h"
-
- #include
-
-@@ -585,7 +586,8 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
- for(std::vector::const_iterator di = defs.begin();
- di != defs.end(); ++di)
- {
-- fout <<" c_str() << "\" />\n";
-+ cmXMLSafe safedef(di->c_str());
-+ fout <<" \n";
- }
- }
-
---
-1.7.0
-
diff --git a/dev-util/cmake/files/cmake-2.8.6-FindBLAS-2.patch b/dev-util/cmake/files/cmake-2.8.6-FindBLAS-2.patch
deleted file mode 100644
index 16b6480f577b..000000000000
--- a/dev-util/cmake/files/cmake-2.8.6-FindBLAS-2.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ruN cmake-2.8.6.orig/Modules/FindBLAS.cmake cmake-2.8.6/Modules/FindBLAS.cmake
---- cmake-2.8.6.orig/Modules/FindBLAS.cmake 2011-10-04 18:09:24.000000000 +0200
-+++ cmake-2.8.6/Modules/FindBLAS.cmake 2011-11-22 23:04:17.000000000 +0100
-@@ -1,3 +1,9 @@
-+#
-+# Version modified for Gentoo Linux
-+# If a valid PkgConfig configuration for blas is found, this overrides and cancels
-+# all further checks.
-+#
-+
- # - Find BLAS library
- # This module finds an installed fortran library that implements the BLAS
- # linear-algebra interface (see http://www.netlib.org/blas/).
-@@ -39,6 +45,14 @@
- # (To distribute this file outside of CMake, substitute the full
- # License text for the above reference.)
-
-+#
-+# first, try PkgConfig
-+#
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(BLAS blas)
-+if(NOT BLAS_FOUND)
-+message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.")
-+
- include(CheckFunctionExists)
- include(CheckFortranFunctionExists)
-
-@@ -622,3 +636,6 @@
- endif(BLA_F95)
-
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
-+
-+endif(NOT BLAS_FOUND)
-+
diff --git a/dev-util/cmake/files/cmake-2.8.6-FindLAPACK-2.patch b/dev-util/cmake/files/cmake-2.8.6-FindLAPACK-2.patch
deleted file mode 100644
index 579a07d880a1..000000000000
--- a/dev-util/cmake/files/cmake-2.8.6-FindLAPACK-2.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- cmake-2.8.6.orig/Modules/FindLAPACK.cmake 2011-10-09 23:38:48.956933106 +0800
-+++ cmake-2.8.6.orig/Modules/FindLAPACK.cmake 2011-10-09 23:39:52.002144646 +0800
-@@ -1,3 +1,9 @@
-+#
-+# Version modified for Gentoo Linux
-+# If a valid PkgConfig configuration is found, this overrides and cancels
-+# all further checks.
-+#
-+
- # - Find LAPACK library
- # This module finds an installed fortran library that implements the LAPACK
- # linear-algebra interface (see http://www.netlib.org/lapack/).
-@@ -36,6 +42,14 @@
- # (To distribute this file outside of CMake, substitute the full
- # License text for the above reference.)
-
-+#
-+# first, try PkgConfig
-+#
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(LAPACK lapack)
-+if(NOT LAPACK_FOUND)
-+message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.")
-+
- set(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
-
- get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES)
-@@ -304,4 +318,6 @@
- endif(NOT LAPACK_FIND_QUIETLY)
- endif(BLA_F95)
-
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
-+
-+endif(NOT LAPACK_FOUND)
diff --git a/dev-util/cmake/files/cmake-2.8.6-testsvn17.patch b/dev-util/cmake/files/cmake-2.8.6-testsvn17.patch
deleted file mode 100644
index 77467676c841..000000000000
--- a/dev-util/cmake/files/cmake-2.8.6-testsvn17.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/Tests/CTestUpdateSVN.cmake.in b/Tests/CTestUpdateSVN.cmake.in
-index 97b2a07..edafb4ef 100644
---- a/Tests/CTestUpdateSVN.cmake.in
-+++ b/Tests/CTestUpdateSVN.cmake.in
-@@ -23,6 +23,16 @@ file(MAKE_DIRECTORY ${TOP}/config)
- set(SVNCMD ${SVN} --config-dir ${TOP}/config)
- set(SVNUSER --username "test author" --non-interactive)
-
-+# Configure for this svn version.
-+execute_process(
-+ COMMAND ${SVN} help add OUTPUT_VARIABLE help_add ERROR_VARIABLE help_add
-+ )
-+if("${help_add}" MATCHES "--depth")
-+ set(depth_empty "--depth=empty")
-+else()
-+ set(depth_empty "")
-+endif()
-+
- #-----------------------------------------------------------------------------
- # Initialize the testing directory.
- message("Creating test directory...")
-@@ -63,7 +73,7 @@ update_content(user-source files_added files_removed dirs_added)
- if(dirs_added)
- run_child(
- WORKING_DIRECTORY ${TOP}/user-source
-- COMMAND ${SVNCMD} add ${dirs_added}
-+ COMMAND ${SVNCMD} add ${depth_empty} ${dirs_added}
- )
- endif(dirs_added)
- run_child(
diff --git a/dev-util/cucumber/cucumber-1.1.4.ebuild b/dev-util/cucumber/cucumber-1.1.4.ebuild
index 0ddd0fc19e2e..c5ba29255147 100644
--- a/dev-util/cucumber/cucumber-1.1.4.ebuild
+++ b/dev-util/cucumber/cucumber-1.1.4.ebuild
@@ -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/dev-util/cucumber/cucumber-1.1.4.ebuild,v 1.4 2012/06/12 11:51:05 iksaif Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cucumber/cucumber-1.1.4.ebuild,v 1.5 2012/07/08 16:38:52 jer Exp $
EAPI=2
USE_RUBY="ruby18 ruby19 ree18"
@@ -18,7 +18,7 @@ DESCRIPTION="Executable feature scenarios"
HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
LICENSE="Ruby"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~hppa"
SLOT="0"
IUSE="examples"
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index f17ceb898b12..f4fb8d316fad 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,9 +1,2 @@
-DIST debhelper_9.20120115.tar.gz 461544 SHA256 be935f693533fdd8c1f9bafd6b4bf746e4e9542a15a4f64d87a8cdd7a57524a4 SHA512 b44f8d93feb88c5d6e8b7287d7248c844f2c4a3c31be8ef704eeacfed9c7bdf4574fb7177910c5278aa4205255aaf681824b1486380967068550c907ca2cb9bb WHIRLPOOL 26159b0bdb08dfdb1eda87938b893c4b90e92f856ef5ff8e920c172387da6bef93100c9c7bf99612b9eaec1e9c69a276aa3cc8b419c71c01946b6f64dbefc93d
-DIST debhelper_9.20120312.tar.gz 462033 SHA256 64826e98d2d315a5e4ab7e7eaf260db76b3ee00521eacb972c4d1660e807c083 SHA512 2183bfee3d4ba2b69aa4bfad8491a5e5e9fc05ef29c2bff4701225d9d83e1991a0a00cf1f9863a34e1bd4b207511ea8cac5392b15f99170d42f2c5f0320f8a3f WHIRLPOOL f40d820d157da95316e06047c483829ed2269da72c8b29e2733f7c03b8e2b953fdcd552202f05031f48cdeb9e947f84d8e179549c78a83436e3bf620e3a9eb2c
DIST debhelper_9.20120322.tar.gz 462352 SHA256 41c892f1a068ec63fbbe6a3a1e7b4535e4f77850c3b78af1375b5309f9181ae6 SHA512 8284f1320dc85a2394d0ab9cba24643315219232dbbd60fad22fc1d093b718535c83a391e79d9f9c2d4b297e194cf0b56eaca057fa41ba644ae3a25ff63ca1a1 WHIRLPOOL 28f0fae57295f264e0bd1f094e6a74f3e758b8cb10a32181212dd7018f1c9f62b92f43415786f012cc31ad3a3ea9e540eb2e10e174484114ef858edd458c4d53
-DIST debhelper_9.20120419.tar.gz 463203 SHA256 240697c6bddf6ab0592779cfb7a0bfc3ba2f9d0ab3fd5ba30129cf9a120c0234 SHA512 c285e7f8a662e6ca695e174d50b85e9bf495688f5407bb7d7b99ad071fb067fc4e00757231b5d260896dfab8747bba150eb89c87f1c19fe66d38d69af42cd361 WHIRLPOOL c45359bcab568f0f402de6db2f540d179825c695e46c3fc17cf5c951b288c7c85d2234935a82845519089532736c9403d3cb9d3692934e0d26810d7976579622
-DIST debhelper_9.20120513.tar.gz 463692 SHA256 371103c7b7a488889b748268c2b43e4be6f940d49d591fdf8256260c50b2393c SHA512 89e27112566e05e3082e8e57e82fdaf10627d0ffd12a49eb66e82fdce87da26e55923fdfb3871e7b0c0d863977d12d344d0dafed69c859c069cf0f8fdbf24a1a WHIRLPOOL 9003f6fcea5ae109cc3ec8e4c66ab10c47d6c7fcb52e22613f6257062fa54014ed6dd21bc691058e8f89ab85dbed954df151c1a58acdd4dc7074ec575c76c606
-DIST debhelper_9.20120518.tar.gz 464081 SHA256 875db75943993c7a263c49149363e36c2063fc994e460e7d7767986a84a784f3 SHA512 75960f8affa2b8a02f6af41258215efa6b6a5eee1959668ba33e15fed4e07bc0e23051a284e7170a50712f76c753ab81e08464cc52dd915577b7e8e70905f9da WHIRLPOOL 7b31caedc43baf5434d8868c302a7f94807f9b2174511133099145c4084eefc49f885e1c6df68ee418ad6ed0233c00f954e86fcab3bd35a7afc3106141bc37e9
-DIST debhelper_9.20120523.tar.gz 463708 SHA256 80114e50cd9caf811c063e5149bac60358c04b9cdc66138253989e2c0e359ef5 SHA512 eb92261b8b57b72699ede3d38024a7c19dc2876b19c0c21849a5e748ee30f0bb97e6fc1b320b1908331997983eb8d24d1ab5e7f4b2f35a2e4caa92148a56cfd1 WHIRLPOOL c37d3101b1f0622e049c6a4b5ea1d2c6d697903f25a845723ee21418bbe7473305412812b8a39709c61742cf097609bd0399cc0a0a9950c05e7e2311c5e93760
-DIST debhelper_9.20120528.tar.gz 464083 SHA256 94fcfdebd474bfc9e73dea20d4fbf0f7ab674e7a2da3f9d5811a54a6fad214a8 SHA512 b3772f7aef1b011c97857355b4f4166af9328356af7a817de63e780b43ab9db1fbea82712e4c593a5cacfa880332fd477f617503c72b28d358b78cd79d79d543 WHIRLPOOL e54e903fcf510d5d62a54d57084459d74dff1c7d518d71f233117d66ce54421ad68a6fd54996ca8f46bb1ed3be9015ab68ddec5a224035a2073b69161280b21b
DIST debhelper_9.20120608.tar.gz 464230 SHA256 e6270a9b56563031912cda5cd8cb4c1224304d5b64b561432df3be7db9039ab8 SHA512 8e7ebf8e926d47d6340fe245a8d56d0293b4d55535cfa66c309a30e19f67cc7f481f5245d9447d855cc913089eb7a41b924b168fdba68d54a4bedeaae769800f WHIRLPOOL 922c049e885f80ca000b52b8cdd2f50454e928ee884481005918aadb267a2b1f5fa86eabf72382fc718eabc9d0fc996a23025b9ccb1618fa1e067b2a5df1279a
diff --git a/dev-util/debhelper/debhelper-9.20120115.ebuild b/dev-util/debhelper/debhelper-9.20120115.ebuild
deleted file mode 100644
index dd7554b27a10..000000000000
--- a/dev-util/debhelper/debhelper-9.20120115.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-9.20120115.ebuild,v 1.8 2012/04/01 15:37:21 armin76 Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
-HOMEPAGE="http://packages.qa.debian.org/d/debhelper.html http://kitenet.net/~joey/code/debhelper.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc s390 sh sparc x86"
-IUSE="nls linguas_de linguas_es linguas_fr test"
-
-RDEPEND="app-arch/dpkg
- dev-perl/TimeDate
- virtual/perl-Getopt-Long
- >=dev-lang/perl-5.10"
-
-DEPEND="${RDEPEND}
- nls? ( >=app-text/po4a-0.24 )
- test? ( dev-perl/Test-Pod )"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-7.4.13-conditional-nls.patch
-}
-
-src_compile() {
- tc-export CC
- local USE_NLS=no LANGS=""
-
- use nls && USE_NLS=yes
-
- use linguas_de && LANGS="${LANGS} de"
- use linguas_es && LANGS="${LANGS} es"
- use linguas_fr && LANGS="${LANGS} fr"
-
- emake USE_NLS=${USE_NLS} LANGS="${LANGS}" build
-}
-
-src_install() {
- default
- dodoc doc/* debian/changelog
- docinto examples
- dodoc examples/*
- for manfile in *.1 *.7 ; do
- case ${manfile} in
- *.de.?) use linguas_de \
- && cp ${manfile} "${T}"/${manfile/.de/} \
- && doman -i18n=de "${T}"/${manfile/.de/}
- ;;
- *.es.?) use linguas_es \
- && cp ${manfile} "${T}"/${manfile/.es/} \
- && doman -i18n=es "${T}"/${manfile/.es/}
- ;;
- *.fr.?) use linguas_fr \
- && cp ${manfile} "${T}"/${manfile/.fr/} \
- && doman -i18n=fr "${T}"/${manfile/.fr/}
- ;;
- *) doman ${manfile}
- ;;
- esac
- done
-}
diff --git a/dev-util/debhelper/debhelper-9.20120312.ebuild b/dev-util/debhelper/debhelper-9.20120312.ebuild
deleted file mode 100644
index fffb3e664732..000000000000
--- a/dev-util/debhelper/debhelper-9.20120312.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-9.20120312.ebuild,v 1.1 2012/03/20 21:28:42 jer Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
-HOMEPAGE="http://packages.qa.debian.org/d/debhelper.html http://kitenet.net/~joey/code/debhelper.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE="nls linguas_de linguas_es linguas_fr test"
-
-RDEPEND="app-arch/dpkg
- dev-perl/TimeDate
- virtual/perl-Getopt-Long
- >=dev-lang/perl-5.10"
-
-DEPEND="${RDEPEND}
- nls? ( >=app-text/po4a-0.24 )
- test? ( dev-perl/Test-Pod )"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-7.4.13-conditional-nls.patch
-}
-
-src_compile() {
- tc-export CC
- local USE_NLS=no LANGS=""
-
- use nls && USE_NLS=yes
-
- use linguas_de && LANGS="${LANGS} de"
- use linguas_es && LANGS="${LANGS} es"
- use linguas_fr && LANGS="${LANGS} fr"
-
- emake USE_NLS=${USE_NLS} LANGS="${LANGS}" build
-}
-
-src_install() {
- default
- dodoc doc/* debian/changelog
- docinto examples
- dodoc examples/*
- for manfile in *.1 *.7 ; do
- case ${manfile} in
- *.de.?) use linguas_de \
- && cp ${manfile} "${T}"/${manfile/.de/} \
- && doman -i18n=de "${T}"/${manfile/.de/}
- ;;
- *.es.?) use linguas_es \
- && cp ${manfile} "${T}"/${manfile/.es/} \
- && doman -i18n=es "${T}"/${manfile/.es/}
- ;;
- *.fr.?) use linguas_fr \
- && cp ${manfile} "${T}"/${manfile/.fr/} \
- && doman -i18n=fr "${T}"/${manfile/.fr/}
- ;;
- *) doman ${manfile}
- ;;
- esac
- done
-}
diff --git a/dev-util/debhelper/debhelper-9.20120322.ebuild b/dev-util/debhelper/debhelper-9.20120322.ebuild
index fd3f5e60fe46..abd8af4b7f5d 100644
--- a/dev-util/debhelper/debhelper-9.20120322.ebuild
+++ b/dev-util/debhelper/debhelper-9.20120322.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-9.20120322.ebuild,v 1.7 2012/06/17 17:43:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-9.20120322.ebuild,v 1.8 2012/07/08 15:17:33 jer Exp $
EAPI="4"
inherit eutils toolchain-funcs
DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
-HOMEPAGE="http://packages.qa.debian.org/d/debhelper.html http://kitenet.net/~joey/code/debhelper.html"
+HOMEPAGE="http://packages.qa.debian.org/d/debhelper.html http://joeyh.name/code/debhelper/"
SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-util/debhelper/debhelper-9.20120419.ebuild b/dev-util/debhelper/debhelper-9.20120419.ebuild
deleted file mode 100644
index f1884c61c856..000000000000
--- a/dev-util/debhelper/debhelper-9.20120419.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-9.20120419.ebuild,v 1.1 2012/05/09 14:33:45 jer Exp $
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
-HOMEPAGE="http://packages.qa.debian.org/d/debhelper.html http://kitenet.net/~joey/code/debhelper.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE="nls linguas_de linguas_es linguas_fr test"
-
-RDEPEND="app-arch/dpkg
- dev-perl/TimeDate
- virtual/perl-Getopt-Long
- >=dev-lang/perl-5.10"
-
-DEPEND="${RDEPEND}
- nls? ( >=app-text/po4a-0.24 )
- test? ( dev-perl/Test-Pod )"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-7.4.13-conditional-nls.patch
-}
-
-src_compile() {
- tc-export CC
- local USE_NLS=no LANGS=""
-
- use nls && USE_NLS=yes
-
- use linguas_de && LANGS="${LANGS} de"
- use linguas_es && LANGS="${LANGS} es"
- use linguas_fr && LANGS="${LANGS} fr"
-
- emake USE_NLS=${USE_NLS} LANGS="${LANGS}" build
-}
-
-src_install() {
- default
- dodoc doc/* debian/changelog
- docinto examples
- dodoc examples/*
- for manfile in *.1 *.7 ; do
- case ${manfile} in
- *.de.?) use linguas_de \
- && cp ${manfile} "${T}"/${manfile/.de/} \
- && doman -i18n=de "${T}"/${manfile/.de/}
- ;;
- *.es.?) use linguas_es \
- && cp ${manfile} "${T}"/${manfile/.es/} \
- && doman -i18n=es "${T}"/${manfile/.es/}
- ;;
- *.fr.?) use linguas_fr \
- && cp ${manfile} "${T}"/${manfile/.fr/} \
- && doman -i18n=fr "${T}"/${manfile/.fr/}
- ;;
- *) doman ${manfile}
- ;;
- esac
- done
-}
diff --git a/dev-util/debhelper/debhelper-9.20120513.ebuild b/dev-util/debhelper/debhelper-9.20120513.ebuild
deleted file mode 100644
index 040705861df3..000000000000
--- a/dev-util/debhelper/debhelper-9.20120513.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-9.20120513.ebuild,v 1.1 2012/05/16 17:09:16 jer Exp $
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
-HOMEPAGE="http://packages.qa.debian.org/d/debhelper.html http://kitenet.net/~joey/code/debhelper.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE="nls linguas_de linguas_es linguas_fr test"
-
-RDEPEND="app-arch/dpkg
- dev-perl/TimeDate
- virtual/perl-Getopt-Long
- >=dev-lang/perl-5.10"
-
-DEPEND="${RDEPEND}
- nls? ( >=app-text/po4a-0.24 )
- test? ( dev-perl/Test-Pod )"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-7.4.13-conditional-nls.patch
-}
-
-src_compile() {
- tc-export CC
- local USE_NLS=no LANGS=""
-
- use nls && USE_NLS=yes
-
- use linguas_de && LANGS="${LANGS} de"
- use linguas_es && LANGS="${LANGS} es"
- use linguas_fr && LANGS="${LANGS} fr"
-
- emake USE_NLS=${USE_NLS} LANGS="${LANGS}" build
-}
-
-src_install() {
- default
- dodoc doc/* debian/changelog
- docinto examples
- dodoc examples/*
- for manfile in *.1 *.7 ; do
- case ${manfile} in
- *.de.?) use linguas_de \
- && cp ${manfile} "${T}"/${manfile/.de/} \
- && doman -i18n=de "${T}"/${manfile/.de/}
- ;;
- *.es.?) use linguas_es \
- && cp ${manfile} "${T}"/${manfile/.es/} \
- && doman -i18n=es "${T}"/${manfile/.es/}
- ;;
- *.fr.?) use linguas_fr \
- && cp ${manfile} "${T}"/${manfile/.fr/} \
- && doman -i18n=fr "${T}"/${manfile/.fr/}
- ;;
- *) doman ${manfile}
- ;;
- esac
- done
-}
diff --git a/dev-util/debhelper/debhelper-9.20120518.ebuild b/dev-util/debhelper/debhelper-9.20120518.ebuild
deleted file mode 100644
index c71323026dd7..000000000000
--- a/dev-util/debhelper/debhelper-9.20120518.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-9.20120518.ebuild,v 1.1 2012/05/19 15:17:58 jer Exp $
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
-HOMEPAGE="http://packages.qa.debian.org/d/debhelper.html http://kitenet.net/~joey/code/debhelper.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE="nls linguas_de linguas_es linguas_fr test"
-
-RDEPEND="app-arch/dpkg
- dev-perl/TimeDate
- virtual/perl-Getopt-Long
- >=dev-lang/perl-5.10"
-
-DEPEND="${RDEPEND}
- nls? ( >=app-text/po4a-0.24 )
- test? ( dev-perl/Test-Pod )"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-7.4.13-conditional-nls.patch
-}
-
-src_compile() {
- tc-export CC
- local USE_NLS=no LANGS=""
-
- use nls && USE_NLS=yes
-
- use linguas_de && LANGS="${LANGS} de"
- use linguas_es && LANGS="${LANGS} es"
- use linguas_fr && LANGS="${LANGS} fr"
-
- emake USE_NLS=${USE_NLS} LANGS="${LANGS}" build
-}
-
-src_install() {
- default
- dodoc doc/* debian/changelog
- docinto examples
- dodoc examples/*
- for manfile in *.1 *.7 ; do
- case ${manfile} in
- *.de.?) use linguas_de \
- && cp ${manfile} "${T}"/${manfile/.de/} \
- && doman -i18n=de "${T}"/${manfile/.de/}
- ;;
- *.es.?) use linguas_es \
- && cp ${manfile} "${T}"/${manfile/.es/} \
- && doman -i18n=es "${T}"/${manfile/.es/}
- ;;
- *.fr.?) use linguas_fr \
- && cp ${manfile} "${T}"/${manfile/.fr/} \
- && doman -i18n=fr "${T}"/${manfile/.fr/}
- ;;
- *) doman ${manfile}
- ;;
- esac
- done
-}
diff --git a/dev-util/debhelper/debhelper-9.20120523.ebuild b/dev-util/debhelper/debhelper-9.20120523.ebuild
deleted file mode 100644
index 7b6f3c1eba44..000000000000
--- a/dev-util/debhelper/debhelper-9.20120523.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-9.20120523.ebuild,v 1.1 2012/05/24 05:28:37 jer Exp $
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
-HOMEPAGE="http://packages.qa.debian.org/d/debhelper.html http://kitenet.net/~joey/code/debhelper.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE="nls linguas_de linguas_es linguas_fr test"
-
-RDEPEND="app-arch/dpkg
- dev-perl/TimeDate
- virtual/perl-Getopt-Long
- >=dev-lang/perl-5.10"
-
-DEPEND="${RDEPEND}
- nls? ( >=app-text/po4a-0.24 )
- test? ( dev-perl/Test-Pod )"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-7.4.13-conditional-nls.patch
-}
-
-src_compile() {
- tc-export CC
- local USE_NLS=no LANGS=""
-
- use nls && USE_NLS=yes
-
- use linguas_de && LANGS="${LANGS} de"
- use linguas_es && LANGS="${LANGS} es"
- use linguas_fr && LANGS="${LANGS} fr"
-
- emake USE_NLS=${USE_NLS} LANGS="${LANGS}" build
-}
-
-src_install() {
- default
- dodoc doc/* debian/changelog
- docinto examples
- dodoc examples/*
- for manfile in *.1 *.7 ; do
- case ${manfile} in
- *.de.?) use linguas_de \
- && cp ${manfile} "${T}"/${manfile/.de/} \
- && doman -i18n=de "${T}"/${manfile/.de/}
- ;;
- *.es.?) use linguas_es \
- && cp ${manfile} "${T}"/${manfile/.es/} \
- && doman -i18n=es "${T}"/${manfile/.es/}
- ;;
- *.fr.?) use linguas_fr \
- && cp ${manfile} "${T}"/${manfile/.fr/} \
- && doman -i18n=fr "${T}"/${manfile/.fr/}
- ;;
- *) doman ${manfile}
- ;;
- esac
- done
-}
diff --git a/dev-util/debhelper/debhelper-9.20120528.ebuild b/dev-util/debhelper/debhelper-9.20120528.ebuild
deleted file mode 100644
index c02f8d6b5d78..000000000000
--- a/dev-util/debhelper/debhelper-9.20120528.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-9.20120528.ebuild,v 1.1 2012/05/29 07:37:39 jer Exp $
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
-HOMEPAGE="http://packages.qa.debian.org/d/debhelper.html http://kitenet.net/~joey/code/debhelper.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE="nls linguas_de linguas_es linguas_fr test"
-
-RDEPEND="app-arch/dpkg
- dev-perl/TimeDate
- virtual/perl-Getopt-Long
- >=dev-lang/perl-5.10"
-
-DEPEND="${RDEPEND}
- nls? ( >=app-text/po4a-0.24 )
- test? ( dev-perl/Test-Pod )"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-7.4.13-conditional-nls.patch
-}
-
-src_compile() {
- tc-export CC
- local USE_NLS=no LANGS=""
-
- use nls && USE_NLS=yes
-
- use linguas_de && LANGS="${LANGS} de"
- use linguas_es && LANGS="${LANGS} es"
- use linguas_fr && LANGS="${LANGS} fr"
-
- emake USE_NLS=${USE_NLS} LANGS="${LANGS}" build
-}
-
-src_install() {
- default
- dodoc doc/* debian/changelog
- docinto examples
- dodoc examples/*
- for manfile in *.1 *.7 ; do
- case ${manfile} in
- *.de.?) use linguas_de \
- && cp ${manfile} "${T}"/${manfile/.de/} \
- && doman -i18n=de "${T}"/${manfile/.de/}
- ;;
- *.es.?) use linguas_es \
- && cp ${manfile} "${T}"/${manfile/.es/} \
- && doman -i18n=es "${T}"/${manfile/.es/}
- ;;
- *.fr.?) use linguas_fr \
- && cp ${manfile} "${T}"/${manfile/.fr/} \
- && doman -i18n=fr "${T}"/${manfile/.fr/}
- ;;
- *) doman ${manfile}
- ;;
- esac
- done
-}
diff --git a/dev-util/debhelper/debhelper-9.20120608.ebuild b/dev-util/debhelper/debhelper-9.20120608.ebuild
index e2c4cfaa235c..70df7e9b228b 100644
--- a/dev-util/debhelper/debhelper-9.20120608.ebuild
+++ b/dev-util/debhelper/debhelper-9.20120608.ebuild
@@ -1,17 +1,17 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-9.20120608.ebuild,v 1.1 2012/06/09 13:59:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-9.20120608.ebuild,v 1.3 2012/07/08 23:51:54 jdhore Exp $
EAPI=4
inherit eutils toolchain-funcs
DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
-HOMEPAGE="http://packages.qa.debian.org/d/debhelper.html http://kitenet.net/~joey/code/debhelper.html"
+HOMEPAGE="http://packages.qa.debian.org/d/debhelper.html http://joeyh.name/code/debhelper/"
SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc x86"
IUSE="nls linguas_de linguas_es linguas_fr test"
RDEPEND="app-arch/dpkg
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index 0e10df2ae7f0..b9fa8d6bee61 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -1,5 +1,3 @@
-DIST debootstrap_1.0.38.tar.gz 55586 SHA256 74e9aca4a5aa61f95467e849c04e1b8a2df1ca63d98fe31a2fa2c30e49fe6aa6 SHA512 dab26324731b117de03212718fe8e49cad32be7316c412e9434d5c724fd328f41a50f820f2c8669427ea3aee03a98c49b1608f76df28dbe64db662a782c7d43a WHIRLPOOL 71d7625733d675e759f51faeef40f0f8f6c655a053096ec29a019f5c993055fa1286429371a57d7704c1667522d1cc5e16c22652dc2f67f583dcf15728538615
-DIST debootstrap_1.0.39.tar.gz 55807 SHA256 ac9dbfae8163c563fee2cf938384a220fa5d5b4639fbe9bde79d125c4a18bb11 SHA512 6d1de1543c7fd6208a5d6f121ac0e128971f534eee2c600e7649538397bc45c5123c9497d1f0ebcb953d6ec378044d3af82548b16324645e09ff206b94b19bd7 WHIRLPOOL 21a91b9e3a0b24f70530d1192ad040ea832134c6905c34ecc22346885fa51e210aff69cd42c270f10efeb3f3eff76e7c9107a02c2c3a5c01416b7316bd977be5
DIST debootstrap_1.0.40.tar.gz 55961 SHA256 edc3c6c6d8c107d02064418b8205667e68cb4464a99c540421c4bbcfdb3bf3c6 SHA512 a7fa883e19fd3cd6236ee2c8ca57628ff06f45ce2545d25117dc76222dc824f681bd4cc37b62f23a0c3ebba6c6ed21153a290406e914e3c7c0810c1b5d30ad62 WHIRLPOOL a4b0663fd68071d926809b93d425f105359c18bc6928a5e5def271aececbd91bc32cab13145616b28d8b78df0b190e73641dc51dcec86c0d4c623c4d2c2beb5b
DIST debootstrap_1.0.41.tar.gz 56113 SHA256 d4bd5a3aa5e735d630b94e9089f08c2bcf31d8092410a6fe17157e837e91b5a2 SHA512 7ee4ef2f532c74bac69852a80e19cdaaaed94c872101fdb6258a76667d4444f5f0ce56886ffe8150a2a6b2616aecbff1eacfcb053af6d56e2b257aa1891331db WHIRLPOOL eefa580c1f9852cdd5207ed2c31dbf718b61a34d92960d6a3069bf875cc9c73893796f80e05f84a5386754ed0ce619e189aa5b01e20143b935f932f7b1ce9c22
DIST debootstrap_1.0.42.tar.gz 56313 SHA256 e05b40eb30e37ee6f741d30f133de6a7e569fea53f24269648387c2e04fdaa28 SHA512 37e9a81b69cde2b1a4aade891eeddfae6e5767fa22aa19aa1ecbccfd5737ad70f0a4a743765ec2294841b9064b09f9002af47b105a125cc26fee98bd30ff6477 WHIRLPOOL fcf0e44afadfc3984bd3be6817434b6ceeaaf61813c7916847f7ffe5a560dbeb9d109f1c7c3f1686e7a35744c3e4310c0a6204f91a35a578b325ba84f6b3f75c
diff --git a/dev-util/debootstrap/debootstrap-1.0.38.ebuild b/dev-util/debootstrap/debootstrap-1.0.38.ebuild
deleted file mode 100644
index 13b60e7cd5f0..000000000000
--- a/dev-util/debootstrap/debootstrap-1.0.38.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debootstrap/debootstrap-1.0.38.ebuild,v 1.8 2012/03/31 18:44:15 armin76 Exp $
-
-inherit eutils
-
-DESCRIPTION="Debian/Ubuntu bootstrap scripts"
-HOMEPAGE="http://packages.qa.debian.org/d/debootstrap.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
- mirror://gentoo/devices.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86"
-IUSE=""
-
-RDEPEND="sys-devel/binutils
- net-misc/wget
- >=app-arch/dpkg-1.14.20"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
- unpack ${PN}_${PV}.tar.gz
- cp "${DISTDIR}"/devices.tar.gz "${S}"
-}
-
-src_compile() {
- return
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- dodoc TODO debian/changelog
- doman debootstrap.8
-}
-
-pkg_postinst() {
- elog "To check Release files against a keyring"
- elog " (--keyring=K), please install app-crypt/gnupg."
-}
diff --git a/dev-util/debootstrap/debootstrap-1.0.39.ebuild b/dev-util/debootstrap/debootstrap-1.0.39.ebuild
deleted file mode 100644
index 401aa69f3fe5..000000000000
--- a/dev-util/debootstrap/debootstrap-1.0.39.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debootstrap/debootstrap-1.0.39.ebuild,v 1.6 2012/05/21 09:42:05 phajdan.jr Exp $
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="Debian/Ubuntu bootstrap scripts"
-HOMEPAGE="http://packages.qa.debian.org/d/debootstrap.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
- mirror://gentoo/devices.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~sh ~sparc x86"
-IUSE=""
-
-RDEPEND="
- app-arch/dpkg
- net-misc/wget
- sys-devel/binutils
-"
-
-DOCS=( TODO debian/changelog )
-
-src_unpack() {
- unpack ${PN}_${PV}.tar.gz
- cp "${DISTDIR}"/devices.tar.gz "${S}"
-}
-
-src_compile() {
- return
-}
-
-src_install() {
- default
- doman debootstrap.8
-}
-
-pkg_postinst() {
- elog "To check Release files against a keyring"
- elog " (--keyring=K), please install app-crypt/gnupg."
-}
diff --git a/dev-util/debootstrap/debootstrap-1.0.40.ebuild b/dev-util/debootstrap/debootstrap-1.0.40.ebuild
index 5201885f4f6a..a9c7ced1ffed 100644
--- a/dev-util/debootstrap/debootstrap-1.0.40.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.40.ebuild
@@ -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/dev-util/debootstrap/debootstrap-1.0.40.ebuild,v 1.6 2012/06/17 19:50:27 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debootstrap/debootstrap-1.0.40.ebuild,v 1.7 2012/07/08 16:29:12 armin76 Exp $
EAPI=4
inherit eutils
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
LICENSE="as-is"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86"
IUSE=""
RDEPEND="
diff --git a/dev-util/dialog/dialog-1.1.20120215.ebuild b/dev-util/dialog/dialog-1.1.20120215.ebuild
index ce95c0f82e94..f13c4914bc32 100644
--- a/dev-util/dialog/dialog-1.1.20120215.ebuild
+++ b/dev-util/dialog/dialog-1.1.20120215.ebuild
@@ -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/dev-util/dialog/dialog-1.1.20120215.ebuild,v 1.9 2012/06/07 21:27:50 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/dialog-1.1.20120215.ebuild,v 1.10 2012/07/08 15:09:28 armin76 Exp $
EAPI="4"
@@ -14,7 +14,7 @@ SRC_URI="ftp://invisible-island.net/${PN}/${PN}-${MY_PV}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="examples minimal nls static-libs unicode"
RDEPEND="
diff --git a/dev-util/gdbserver/Manifest b/dev-util/gdbserver/Manifest
index 9b7991490e01..a31ccf50c0d6 100644
--- a/dev-util/gdbserver/Manifest
+++ b/dev-util/gdbserver/Manifest
@@ -1,6 +1,6 @@
-DIST gdb-7.0-patches-1.tar.lzma 10490 RMD160 84055872431d63052d0e1dea0fe0207121663cb1 SHA1 084edd4810732c3e2a09b2760306bae4a3d1459e SHA256 02139587efc8d01041c76a5b453f5d533ecc85d5980d45d7cd432aa80bc5e8ab
-DIST gdb-7.0.tar.bz2 17604459 RMD160 a66d9c8d0aae72bbc9b6564139a95f548e3aa26d SHA1 8aed621b7ddb8c82b6ff213b56c028787db90582 SHA256 c750c695c8029da60688fc6584207fd1ea741a6b9e79e4ad03715bfbc2113ecd
-DIST gdb-7.2-patches-1.tar.xz 8908 RMD160 ca1ec5360ef2b575a548a75baeef90c4aec64138 SHA1 d91b1aa7d743cfbf98d1c72f6015dfa7b856fb86 SHA256 c091d46b869aec70ea507d93936d85e134002766808e38cc29d0a6f1f4898fab
-DIST gdb-7.2.tar.bz2 18530613 RMD160 2f2f5eb331593a276f1b7024ac35f7ca1520653d SHA1 cae138dee0c11778c471a1d5e4b09e0ae08f9e9d SHA256 bf444b88ab845243364c3d410be9e3f43a57f96ff594d65a37842ea03c3410f0
-DIST gdb-7.3.1-patches-1.tar.xz 8196 RMD160 d58126b5855ac129f49d58a2517b12f2b5581d2d SHA1 9365d1e04815958fe7739cbc7b8fbdfe2e3e560e SHA256 ebf99308311469a3fd7ef7b852c0454d3f62fb97394ab391c17e4a34c2364dc3
+DIST gdb-7.0-patches-1.tar.lzma 10490 SHA256 02139587efc8d01041c76a5b453f5d533ecc85d5980d45d7cd432aa80bc5e8ab
+DIST gdb-7.0.tar.bz2 17604459 SHA256 c750c695c8029da60688fc6584207fd1ea741a6b9e79e4ad03715bfbc2113ecd
+DIST gdb-7.2-patches-1.tar.xz 8908 SHA256 c091d46b869aec70ea507d93936d85e134002766808e38cc29d0a6f1f4898fab
+DIST gdb-7.2.tar.bz2 18530613 SHA256 bf444b88ab845243364c3d410be9e3f43a57f96ff594d65a37842ea03c3410f0
+DIST gdb-7.3.1-patches-1.tar.xz 8196 SHA256 ebf99308311469a3fd7ef7b852c0454d3f62fb97394ab391c17e4a34c2364dc3
DIST gdb-7.3.1.tar.bz2 19500995 SHA256 6d7bff716fde98d03866a1b747c0929ee7dba49bca13e01d975e0b0fa9b33a28 SHA512 69d7318a3f6bf3c95804e6526d886348333d85c4f63c19e7575052792851a296073e36e1b54c63151c2db8ca0bfead36693f4513f2fd9dec962870408e8e71d9 WHIRLPOOL 5332eb8bd5a24cac710c39c6948e1d2373939c647ddfb1cae893cafef910e346c880e2ee4f9fa10211e60319fd648176e36362f9a5f3fdd6db7fb967500a0d5f
diff --git a/dev-util/gdbserver/metadata.xml b/dev-util/gdbserver/metadata.xml
index 63ac5653603a..1470e032181b 100644
--- a/dev-util/gdbserver/metadata.xml
+++ b/dev-util/gdbserver/metadata.xml
@@ -2,6 +2,6 @@
- flameeyes@gentoo.org
+ maintainer-needed@gentoo.org
diff --git a/dev-util/spe/spe-0.8.4h.ebuild b/dev-util/spe/spe-0.8.4h.ebuild
index 0251a424784a..639f4b56cc22 100644
--- a/dev-util/spe/spe-0.8.4h.ebuild
+++ b/dev-util/spe/spe-0.8.4h.ebuild
@@ -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/dev-util/spe/spe-0.8.4h.ebuild,v 1.4 2011/04/27 19:17:36 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/spe/spe-0.8.4h.ebuild,v 1.5 2012/07/08 15:27:28 armin76 Exp $
EAPI="3"
PYTHON_DEPEND="2"
@@ -18,7 +18,7 @@ SRC_URI="mirror://berlios/python/spe-${MY_PV}-wx2.6.1.0.tar.gz"
IUSE=""
SLOT="0"
LICENSE="GPL-3"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
+KEYWORDS="~amd64 ~ppc x86"
DEPEND=""
RDEPEND=">=dev-python/pychecker-0.8.18
diff --git a/dev-vcs/git/git-1.7.8.6.ebuild b/dev-vcs/git/git-1.7.8.6.ebuild
index 5ba6b68d7c4d..ece13433f534 100644
--- a/dev-vcs/git/git-1.7.8.6.ebuild
+++ b/dev-vcs/git/git-1.7.8.6.ebuild
@@ -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/dev-vcs/git/git-1.7.8.6.ebuild,v 1.6 2012/07/03 19:28:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.6.ebuild,v 1.7 2012/07/08 08:30:45 xmw Exp $
EAPI=4
@@ -32,7 +32,7 @@ if [[ ${PV} != *9999 ]]; then
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
)"
- KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-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 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
else
SRC_URI=""
KEYWORDS=""
diff --git a/eclass/base.eclass b/eclass/base.eclass
index b9e520b69ba9..3a51a7cdb345 100644
--- a/eclass/base.eclass
+++ b/eclass/base.eclass
@@ -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/eclass/base.eclass,v 1.56 2012/02/06 21:33:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.57 2012/07/09 02:38:05 floppym Exp $
# @ECLASS: base.eclass
# @MAINTAINER:
@@ -9,8 +9,7 @@
# Original author: Dan Armak
# @BLURB: The base eclass defines some default functions and variables.
# @DESCRIPTION:
-# The base eclass defines some default functions and variables. Nearly
-# everything else inherits from here.
+# The base eclass defines some default functions and variables.
if [[ ${___ECLASS_ONCE_BASE} != "recur -_+^+_- spank" ]] ; then
___ECLASS_ONCE_BASE="recur -_+^+_- spank"
diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass
index 911f5d63a466..28e840fa5e8f 100644
--- a/eclass/haskell-cabal.eclass
+++ b/eclass/haskell-cabal.eclass
@@ -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/eclass/haskell-cabal.eclass,v 1.32 2012/04/19 17:33:19 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.33 2012/07/08 19:16:46 slyfox Exp $
# @ECLASS: haskell-cabal.eclass
# @MAINTAINER:
@@ -352,7 +352,7 @@ cabal-pkg() {
# You can also put a space separated list, eg CABAL_CORE_LIB_GHC_PV="6.6 6.6.1".
cabal-is-dummy-lib() {
for version in ${CABAL_CORE_LIB_GHC_PV[*]}; do
- [[ "$(ghc-version)" == "$version" ]] && return 0
+ [[ "$(ghc-version)" == ${version} ]] && return 0
done
return 1
}
@@ -461,6 +461,25 @@ cabal_src_install() {
dodir ${ghc_confdir_with_prefix#${EPREFIX}}
local conf_file="${D}/$(ghc-confdir)/$(ghc-localpkgconf)"
[[ -e $conf_file ]] || echo '[]' > "$conf_file" || die
+
+ # make sure installed packages do not destroy ghc's
+ # bundled packages
+ local initial_pkg_db=${ROOT}/$(ghc-libdir)/package.conf.d.initial
+ if [[ -e ${initial_pkg_db} ]]; then
+ local checked_pkg
+ for checked_pkg in $(ghc-listpkg "${conf_file}")
+ do
+ local initial_pkg
+ for initial_pkg in $(ghc-listpkg "${initial_pkg_db}"); do
+ if [[ ${checked_pkg} = ${initial_pkg} ]]; then
+ eerror "Package ${checked_pkg} is shipped with $(ghc-version)."
+ eerror "Ebuild author forgot CABAL_CORE_LIB_GHC_PV entry."
+ eerror "Found in ${initial_pkg_db}."
+ die
+ fi
+ done
+ done
+ fi
}
haskell-cabal_src_install() {
diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index 149e483782a9..10034a534d54 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -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/eclass/ruby-ng.eclass,v 1.47 2012/07/05 21:23:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.48 2012/07/08 12:38:10 flameeyes Exp $
# @ECLASS: ruby-ng.eclass
# @MAINTAINER:
@@ -658,3 +658,37 @@ ruby-ng_rspec() {
${RUBY} -S rspec ${rspec_params} "$@" || die "rspec failed"
}
+
+# @FUNCTION: ruby-ng_testrb-2
+# @DESCRIPTION:
+# This is simply a replacement for the testrb command that load the test
+# files and execute them, with test-unit 2.x. This actually requires
+# either an old test-unit-2 version or 2.5.1-r1 or later, as they remove
+# their script and we installed a broken wrapper for a while.
+# This also respects TEST_VERBOSE and NOCOLOR environment variables.
+ruby-ng_testrb-2() {
+ if [[ ${DEPEND} != *"dev-ruby/test-unit"* ]]; then
+ ewarn "Missing dev-ruby/test-unit in \${DEPEND}"
+ fi
+
+ local testrb_params=
+ case ${NOCOLOR} in
+ 1|yes|true)
+ testrb_params+=" --no-use-color"
+ ;;
+ *)
+ testrb_params+=" --use-color=auto"
+ ;;
+ esac
+
+ case ${TEST_VERBOSE} in
+ 1|yes|true)
+ testrb_params+=" --verbose=verbose"
+ ;;
+ *)
+ testrb_params+=" --verbose=normal"
+ ;;
+ esac
+
+ ${RUBY} -S testrb-2 ${testrb_params} "$@" || die "testrb-2 failed"
+}
diff --git a/games-arcade/amphetamine/Manifest b/games-arcade/amphetamine/Manifest
index dbaf42d78499..ce51d856f7f8 100644
--- a/games-arcade/amphetamine/Manifest
+++ b/games-arcade/amphetamine/Manifest
@@ -1,2 +1,2 @@
-DIST amphetamine-0.8.10.tar.bz2 72324 RMD160 80067a1a982d7f0559481c44645661843a14fc2d SHA1 c3911ec2be55fd787bd0b852ad34420180f2ee97 SHA256 6cf7542d7a6b1c3f3cc660164961aa3fecd90fc3ebd7f9b640bf73dfca6aa677
-DIST amphetamine-data-0.8.6.tar.bz2 928775 RMD160 720c14873b3850e260dcae406bf3b29cf4e540a1 SHA1 092c4cd245d2378174f98cb9cfaa59d96e0d39d0 SHA256 b51a0edaf3271008a5e0b3061556898e3d0e27a554803d53caaaec14ecb730aa
+DIST amphetamine-0.8.10.tar.bz2 72324 SHA256 6cf7542d7a6b1c3f3cc660164961aa3fecd90fc3ebd7f9b640bf73dfca6aa677 SHA512 eb3106df6070e207ffb3293ac4701bba8222603c0e399667505bad29b6f6433dc9ec008499b5180f713a724d3b686fead15536a20927195bc57780be16a860ef WHIRLPOOL a9b2706c0b8418d14fb87ad8451a2ea6a72c8e8ad1ecceaf72fa34458f3368b21541aaadafb24cf11f7128373679c70e9cc7e79ef420c0145896f8222ecc5c11
+DIST amphetamine-data-0.8.6.tar.bz2 928775 SHA256 b51a0edaf3271008a5e0b3061556898e3d0e27a554803d53caaaec14ecb730aa SHA512 0feb86f420b4816064594756bb30bb6e02ae5062f03ef175b3262a8f30043340933f6f1b1894e2b2cfad70befc76d3ed1e0d2777c2dc2f7461459e8a93efeaf1 WHIRLPOOL 09fab6986514a13d3341cccdc557a4110714a66bd352e9166f8c7f935aeb20eb3f2f3cac84400384cb640f9a53451845ffd6c8b653ba8f1c06c4c69bf43090f4
diff --git a/games-arcade/amphetamine/amphetamine-0.8.10.ebuild b/games-arcade/amphetamine/amphetamine-0.8.10.ebuild
index 431caf2c56e5..fd2806d02037 100644
--- a/games-arcade/amphetamine/amphetamine-0.8.10.ebuild
+++ b/games-arcade/amphetamine/amphetamine-0.8.10.ebuild
@@ -1,9 +1,9 @@
-# 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/games-arcade/amphetamine/amphetamine-0.8.10.ebuild,v 1.9 2010/01/07 21:47:36 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/amphetamine/amphetamine-0.8.10.ebuild,v 1.10 2012/07/08 00:20:49 tristan Exp $
EAPI=2
-inherit eutils toolchain-funcs games
+inherit eutils games
DESCRIPTION="a cool Jump'n Run game offering some unique visual effects"
HOMEPAGE="http://homepage.hispeed.ch/loehrer/amph/amph.html"
@@ -18,18 +18,13 @@ IUSE=""
DEPEND="media-libs/libsdl[audio,video]
x11-libs/libXpm"
-src_prepare() {
- epatch "${FILESDIR}"/${P}-64bit.patch
- sed -i \
- -e "/^INSTALL_DIR /s:=.*:= ${GAMES_DATADIR}/${PN}:" \
- -e "/^CFLAGS /s:$: ${CFLAGS}:" \
- -e "/^CXXFLAGS /s:-O9.*:${CXXFLAGS}:" \
- -e "/^DEPENDFLAGS /s:-g ::" \
- -e "/^LINKER /s:$: ${LDFLAGS}:" \
- -e "s:gcc:$(tc-getCC):" \
- -e "s:g++:$(tc-getCXX):" \
- Makefile \
- || die "sed failed"
+PATCHES=(
+ "${FILESDIR}"/${P}-build.patch
+ "${FILESDIR}"/${P}-64bit.patch
+)
+
+src_compile() {
+ emake INSTALL_DIR="${GAMES_DATADIR}"/${PN} || die
}
src_install() {
diff --git a/games-arcade/amphetamine/files/amphetamine-0.8.10-build.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-build.patch
new file mode 100644
index 000000000000..2c0185f3ff01
--- /dev/null
+++ b/games-arcade/amphetamine/files/amphetamine-0.8.10-build.patch
@@ -0,0 +1,33 @@
+--- Makefile
++++ Makefile
+@@ -26,8 +26,8 @@
+
+ # makemake variables
+
+-LINKER := g++
+-DEPENDFLAGS := -g ${SEARCHDIRS}
++LINKER = $(CXX) $(CXXFLAGS)
++DEPENDFLAGS := ${SEARCHDIRS}
+ TOUCHHEADERS := ${MYCODEDIR}/*.h
+
+ # C
+@@ -37,8 +37,8 @@
+
+ # C++
+
+-CXX := g++
+-CXXFLAGS = ${DEPENDFLAGS} -O9 -funroll-loops -fomit-frame-pointer -ffast-math -Wcast-align
++CXX ?= g++
++CXXFLAGS += ${DEPENDFLAGS}
+
+ %.o : %.cpp
+ ${CXX} ${CPPFLAGS} -c $< ${CXXFLAGS} -o $@
+@@ -66,7 +66,7 @@
+ LOADLIBES := $(LOADLIBES) -lXpm -lXt
+ endif
+
+-LDFLAGS = -L/usr/lib -L/usr/local/lib -L/usr/X11R6/lib
++LDFLAGS += -L/usr/lib -L/usr/local/lib -L/usr/X11R6/lib
+
+ .PHONY : default
+ default : amph
diff --git a/games-board/hexxagon/Manifest b/games-board/hexxagon/Manifest
index 75a49db94fe5..abcc7832a887 100644
--- a/games-board/hexxagon/Manifest
+++ b/games-board/hexxagon/Manifest
@@ -1 +1 @@
-DIST hexxagon-1.0.1.tar.bz2 1278325 RMD160 fc023265a2c1bc0ba8f054197608c8024871eaab SHA1 02aaab7fab771ae58dd0d43f761763136e034f02 SHA256 a6a1579990797276132f5d0e26b5b70d60ef654cb35261e2b6c26220e7d40fd9
+DIST hexxagon-1.0.1.tar.bz2 1278325 SHA256 a6a1579990797276132f5d0e26b5b70d60ef654cb35261e2b6c26220e7d40fd9 SHA512 528b754a36c681f24cf0b420620e9b1712aea9950ad066f0c8bbb87b2e7580745a63c373dd06e4db1d4630fbf2ff0fa399a073220e7cb6c1c93b0c4fa429e6c9 WHIRLPOOL f963ab5c2d48561382d874059426ba0a5f84ce39ca08b36f2555a711adec90b402b61a47a31a81cc3c3a6c24c752f447ab85434d9cb4876ba9251d618f4b3505
diff --git a/games-board/hexxagon/files/hexxagon-1.0.1-gcc47.patch b/games-board/hexxagon/files/hexxagon-1.0.1-gcc47.patch
new file mode 100644
index 000000000000..c3836cc5d5b2
--- /dev/null
+++ b/games-board/hexxagon/files/hexxagon-1.0.1-gcc47.patch
@@ -0,0 +1,43 @@
+--- src/gui/gtkhexxagonboard.cpp
++++ src/gui/gtkhexxagonboard.cpp
+@@ -120,8 +120,8 @@
+ posx += width * offset / 2;
+ posy += height * offset / 2;
+
+- int x = (int) round(posx) + xoff;
+- int y = (int) round(posy) + yoff;
++ int displayx = (int) round(posx) + xoff;
++ int displayy = (int) round(posy) + yoff;
+
+ int type;
+ LookUp lookup(bbMask);
+@@ -155,10 +155,10 @@
+
+ Glib::RefPtr gc = Gdk::GC::create(back);
+ gc->set_clip_mask(mask[type]);
+- gc->set_clip_origin(x, y);
++ gc->set_clip_origin(displayx, displayy);
+
+ if(back && map_board[type])
+- back->draw_drawable(gc, map_board[type], 0, 0, x, y, -1, -1);
++ back->draw_drawable(gc, map_board[type], 0, 0, displayx, displayy, -1, -1);
+
+ cellNo++;
+ }
+@@ -205,12 +205,12 @@
+ posx += width * offset / 2;
+ posy += height * offset / 2;
+
+- int x = (int) round(posx + w / 2) + xoff;
+- int y = (int) round(posy + h / 2) + yoff;
++ int displayx = (int) round(posx + w / 2) + xoff;
++ int displayy = (int) round(posy + h / 2) + yoff;
+
+ // Now we got the place for cell cellNo
+- double dx = inx - x;
+- double dy = iny - y;
++ double dx = inx - displayx;
++ double dy = iny - displayy;
+ double a = (w/2)*(w/2);
+ double b = (h/2)*(h/2);
+
diff --git a/games-board/hexxagon/hexxagon-1.0.1.ebuild b/games-board/hexxagon/hexxagon-1.0.1.ebuild
index 07d42cccfa10..8649abfd00cf 100644
--- a/games-board/hexxagon/hexxagon-1.0.1.ebuild
+++ b/games-board/hexxagon/hexxagon-1.0.1.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/hexxagon/hexxagon-1.0.1.ebuild,v 1.7 2012/05/04 04:30:09 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/hexxagon/hexxagon-1.0.1.ebuild,v 1.8 2012/07/07 23:10:25 tristan Exp $
EAPI=2
inherit eutils games
-DESCRIPTION="clone of the original DOS game"
+DESCRIPTION="Clone of the original DOS game"
HOMEPAGE="http://www.nesqi.se/"
SRC_URI="http://www.nesqi.se/download/${P}.tar.bz2"
@@ -14,12 +14,14 @@ SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE=""
-RDEPEND=">=dev-cpp/glibmm-2.4:2
- >=dev-cpp/gtkmm-2.4:2.4
+RDEPEND="dev-cpp/glibmm:2
+ dev-cpp/gtkmm:2.4
x11-libs/gtk+:2"
DEPEND="${RDEPEND}
virtual/pkgconfig"
+PATCHES=( "${FILESDIR}"/${P}-gcc47.patch )
+
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
newicon images/board_N_2.xpm ${PN}.xpm
diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index c9d05765cdaf..54b465649478 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,4 +1,4 @@
-DIST UrbanTerror_41_FULL.zip 754307397 RMD160 e7b46b8b70364f1556f057ab9adb35a54bd2b9a2 SHA1 bbe4262bc46f3ef43525ef338bdda05debf3e2c4 SHA256 5706957783d0e4e77fcc4bbbc2df83aefc0f9a6388f6a63b60947e84f9ed265f
-DIST ioq3-1807-urt-251210-git-nobumpy.tar.xz 276824 RMD160 598293efce60617b75bfc4df4c1167d2a3e3614d SHA1 88151fea0323f96c762f62af2b13fcfef3bde4c8 SHA256 9f14d629f2a9c8fe0a593b5a08d1ceadec6a22c387806d9e5f50e22a537c2b74
-DIST ioquake3-1807.tar.bz2 7054317 RMD160 6623385aa294907452816febdecfa5658eac8b17 SHA1 8470d58ac60da14b1e86d5944f1cd32198ab2baf SHA256 10d3fcee3cf41a063e686048740417c8d58496f3dff5745f897a8803318850c2
-DIST urbanterror.svg 1592 RMD160 dd7cbf6216cc623fa9a14e0c384d662aa45657fb SHA1 6819d4d3d772fc4c7fe5004d17c8fc0a1cb46cab SHA256 0d7eb12a8fe8380e0d89199621414dd56ecdfe8a8b99eec5b95d925294521de9
+DIST UrbanTerror_41_FULL.zip 754307397 SHA256 5706957783d0e4e77fcc4bbbc2df83aefc0f9a6388f6a63b60947e84f9ed265f SHA512 4ff729df5472b9bd3138e62fe2e03c794dd9293ba08106c026a120d6c9971ea2420c3e81abb99e2b2ae8a082a07e96468154958b36a770cce0e931f9a499e623 WHIRLPOOL 4752ff4455d2c69fcc732ee4035b097aed852e55bf1077c59e650297f69b87ea59ff53573b653f22843ffe7fe35e524eb66f1033049dcc364ca554bf875dad18
+DIST ioq3-1807-urt-251210-git-nobumpy.tar.xz 276824 SHA256 9f14d629f2a9c8fe0a593b5a08d1ceadec6a22c387806d9e5f50e22a537c2b74 SHA512 e190f60d9c3275d285c75ba2947734cf9f555d373618a37f3b38464d10fa85a4af6460918676b18a96885fe7280c856f6c9877175dbbe82929f5f7c1704fc6a3 WHIRLPOOL 104960ca4066726cdd5dbd0d4d93998e6fc648c4e969109b3a1634232f6d4e3556c3107dd0f78860444ed3635bd3f4a979cb67d90a650b1dd8f51175b9b8e10d
+DIST ioquake3-1807.tar.bz2 7054317 SHA256 10d3fcee3cf41a063e686048740417c8d58496f3dff5745f897a8803318850c2 SHA512 5fe54b628c66bd8becab259d133825e762a0814c7060c8d1f48e2b662f07f80e50fba8c7ae0677b02e231eae59eba65e143eb802baa79a7de89a7a612ae9682d WHIRLPOOL 03ed102b386b33ceff1588966409f1d4c6be1d980b40cac0eda1d2a7e763e45b3cd21a9817f77d60157cf741f4d7479926aac118f5972bb7d5fd6bc72517faa8
+DIST urbanterror.svg 1592 SHA256 0d7eb12a8fe8380e0d89199621414dd56ecdfe8a8b99eec5b95d925294521de9 SHA512 ff789b35d9b1a2282485495b0d1918c7169906aeac094e7a33c7d77cd51d4787733400e1b9851ce19b38e886508d5fdd09f6cfc96b37a5b41bd0cf403e456b98 WHIRLPOOL 281413cfeb881466c2d8b882d0aa4dcf19013630a462775345c69e78a0cb86c7efed14f5d22b453c89648da682ab5e98e3579a1c975994a8e90b9fb22c37892c
diff --git a/games-fps/urbanterror/urbanterror-4.1.1.ebuild b/games-fps/urbanterror/urbanterror-4.1.1.ebuild
index 10dd5c0f34ef..a32883972c49 100644
--- a/games-fps/urbanterror/urbanterror-4.1.1.ebuild
+++ b/games-fps/urbanterror/urbanterror-4.1.1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/urbanterror-4.1.1.ebuild,v 1.4 2012/06/06 08:36:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/urbanterror-4.1.1.ebuild,v 1.5 2012/07/08 16:01:07 hasufell Exp $
EAPI=4
-inherit eutils games
+inherit eutils gnome2-utils games
MY_PV=${PV//./}
IOQ3_SVN=1807
@@ -114,3 +114,17 @@ src_install() {
prepgamesdirs
}
+
+pkg_preinst() {
+ games_pkg_preinst
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ games_pkg_postinst
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/games-puzzle/pingus/Manifest b/games-puzzle/pingus/Manifest
index e11cfac9cf2f..01fa8384f52f 100644
--- a/games-puzzle/pingus/Manifest
+++ b/games-puzzle/pingus/Manifest
@@ -1 +1 @@
-DIST pingus-0.7.6.tar.bz2 12622268 RMD160 0b8377a5eddbdfeac5ec765e87902271a5c0c268 SHA1 b5f5a25d71beb197c9466fb8928018a377f56487 SHA256 759c1253075d1e72691bc1e770b24cdd51917041fd1857c1daf85b65a6686460
+DIST pingus-0.7.6.tar.bz2 12622268 SHA256 759c1253075d1e72691bc1e770b24cdd51917041fd1857c1daf85b65a6686460 SHA512 6c8c2ace1a9229b4e3b506aee76aa94c0dd906a64fa2c817902c2cd3854df390cf675c8c6ddd3ba1926a467348b2103818bd44bc095378cc7bf3f2ff7af27188 WHIRLPOOL 2c4bafef86c40fec3fcfc9ff4b298e72919c8309d475aa4aeb4d368927ac611801f416375108091d9f40bdb2703633765125f6f7ea361186f637e2d5234e53e2
diff --git a/games-puzzle/pingus/files/pingus-0.7.6-gcc47.patch b/games-puzzle/pingus/files/pingus-0.7.6-gcc47.patch
new file mode 100644
index 000000000000..b1397da31f68
--- /dev/null
+++ b/games-puzzle/pingus/files/pingus-0.7.6-gcc47.patch
@@ -0,0 +1,22 @@
+--- src/pingus/pingus_main.cpp.orig 2012-07-08 14:02:40.343767438 +0200
++++ src/pingus/pingus_main.cpp 2012-07-08 14:02:54.062768168 +0200
+@@ -465,7 +465,7 @@
+ void
+ PingusMain::print_greeting_message()
+ {
+- std::string greeting = "Welcome to Pingus "VERSION;
++ std::string greeting = "Welcome to Pingus " VERSION;
+ greeting += "!";
+ std::cout << greeting << std::endl;
+ for (unsigned int i = 0; i < greeting.length(); ++i)
+--- src/pingus/screens/pingus_menu.cpp.orig 2012-07-08 14:03:05.549768782 +0200
++++ src/pingus/screens/pingus_menu.cpp 2012-07-08 14:03:17.015769393 +0200
+@@ -153,7 +153,7 @@
+ gc.get_height()/2 - 280));
+
+ gc.print_left(Fonts::pingus_small, Vector2i(gc.get_width()/2 - 400 + 25, gc.get_height()-140),
+- "Pingus "VERSION" - Copyright (C) 1998-2011 Ingo Ruhnke \n"
++ "Pingus " VERSION " - Copyright (C) 1998-2011 Ingo Ruhnke \n"
+ "See the file AUTHORS for a complete list of contributors.\n"
+ "Pingus comes with ABSOLUTELY NO WARRANTY. This is free software, and you are\n"
+ "welcome to redistribute it under certain conditions; see the file COPYING for details.\n");
diff --git a/games-puzzle/pingus/pingus-0.7.6.ebuild b/games-puzzle/pingus/pingus-0.7.6.ebuild
index 9ec8604cd3d4..2dc588e14af5 100644
--- a/games-puzzle/pingus/pingus-0.7.6.ebuild
+++ b/games-puzzle/pingus/pingus-0.7.6.ebuild
@@ -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/games-puzzle/pingus/pingus-0.7.6.ebuild,v 1.7 2012/06/30 05:00:28 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/pingus-0.7.6.ebuild,v 1.8 2012/07/09 02:30:02 mr_bones_ Exp $
EAPI=2
inherit eutils flag-o-matic scons-utils toolchain-funcs games
@@ -38,7 +38,9 @@ src_prepare() {
export BOOST_LIBRARYDIR="/usr/$(get_libdir)/boost-${boost_ver}"
strip-flags
- epatch "${FILESDIR}"/${P}-noopengl.patch
+ epatch \
+ "${FILESDIR}"/${P}-noopengl.patch \
+ "${FILESDIR}"/${P}-gcc47.patch
}
src_compile() {
diff --git a/games-strategy/uqm/Manifest b/games-strategy/uqm/Manifest
index 892ea45dae1f..c76fe07167d8 100644
--- a/games-strategy/uqm/Manifest
+++ b/games-strategy/uqm/Manifest
@@ -1,7 +1,7 @@
-DIST uqm-0.7.0-3domusic.uqm 18980671 RMD160 f64a196948c446553096a1137eb6fcd84090d054 SHA1 90330f335871dd2728b2232f5b287734bb79e12e SHA256 c57085e64dad4bddf8a679a9aa2adf63f2156d5f6cbabe63af80519033dbcb82
-DIST uqm-0.7.0-content.uqm 11538533 RMD160 92d0e6bde471fd3c6b9147211f09263c1a9482f7 SHA1 2dea07390708790779ae25886e9331b5eb0bdf68 SHA256 b8f6db8ba29f0628fb1d5c233830896b19f441aee3744bda671ea264b44da3bf
-DIST uqm-0.7.0-source.tgz 1562003 RMD160 b760ad256075e4e225e44e5a738a013a9a5e6483 SHA1 55e5257690650e63f131024ab8fdfdddcf5627bc SHA256 a3695c5f7f0be7ec9c0f80ec569907b382023a1fee6e635532bd53b7b53bb221
-DIST uqm-0.7.0-voice.uqm 115143439 RMD160 aee25a15440f810301638d3be04acc630d033fc6 SHA1 700145d023d10c9aaa7bbf8c51aaca75254453c5 SHA256 bcccf801b4ba37594ff6217b292744ea586ee2d447e927804842ccae8b73c979
-DIST uqm-remix-pack1.zip 50188123 RMD160 1c0cf233d6377918b676bcd591f4304b8da85aa1 SHA1 7cbdc87887ebebae5439c689fc5bd2ffa9460fc8 SHA256 1b9ccc799e531f50580952af92b342fb6684ae97b7bdc434f3b7e22d0c230644
-DIST uqm-remix-pack2.zip 60281175 RMD160 441edc71e3006e43629ee262fef8ef8676573832 SHA1 f1ebca44ff105f968d6fcf65df935926523b1c97 SHA256 1dff1792a558a52eb5cbdf24e0c1b8b7ec85aff75a00ddb403ec988607f51dd0
-DIST uqm-remix-pack3.zip 39923803 RMD160 786e8dfd7924abf6ef886e7223c1d57b0740d524 SHA1 f55d198c56a0963a6bb2f9c2fe04c4c475b25086 SHA256 4e347d52279785eba4ba5355beae63048ce3b550db3181d4d55df6a20361682d
+DIST uqm-0.7.0-3domusic.uqm 18980671 SHA256 c57085e64dad4bddf8a679a9aa2adf63f2156d5f6cbabe63af80519033dbcb82
+DIST uqm-0.7.0-content.uqm 11538533 SHA256 b8f6db8ba29f0628fb1d5c233830896b19f441aee3744bda671ea264b44da3bf SHA512 c80aa9f1158d07534abc1ef625662dfcd5021cb5e8091d46b3e9a2d96a0fffbe7e9e6cc88680b43d810c8e68a580f7a0d4b62c08e9f7b948ae7f017e4ad20dd2 WHIRLPOOL 328bbbd68701d560eb1bb3f838166afa0f958bb8bd7e6dcc5f7c223a1a5d79c57f08a48cda33612e99d7904d55a0e23b78eabe419f5c5a35ba009cd0b45d8104
+DIST uqm-0.7.0-source.tgz 1562003 SHA256 a3695c5f7f0be7ec9c0f80ec569907b382023a1fee6e635532bd53b7b53bb221 SHA512 443ac13da401d45743f913755647b3309834c57f371fb673c3ea2cacb81184bf30430db10af9001de854363520d1f792f47faffd690c8c2b2f3d12d63b217815 WHIRLPOOL 2e35a334ed575d13c3b48dd819298442cbe30554b00c34dd3cf687a30793c9b4d403339cf807331307d51dd609f253d063930b4dc9f2ce68ce9aff86480cce99
+DIST uqm-0.7.0-voice.uqm 115143439 SHA256 bcccf801b4ba37594ff6217b292744ea586ee2d447e927804842ccae8b73c979
+DIST uqm-remix-pack1.zip 50188123 SHA256 1b9ccc799e531f50580952af92b342fb6684ae97b7bdc434f3b7e22d0c230644
+DIST uqm-remix-pack2.zip 60281175 SHA256 1dff1792a558a52eb5cbdf24e0c1b8b7ec85aff75a00ddb403ec988607f51dd0
+DIST uqm-remix-pack3.zip 39923803 SHA256 4e347d52279785eba4ba5355beae63048ce3b550db3181d4d55df6a20361682d
diff --git a/games-strategy/uqm/uqm-0.7.0-r1.ebuild b/games-strategy/uqm/uqm-0.7.0-r1.ebuild
index ff6a848f4d0e..903bddfa80f0 100644
--- a/games-strategy/uqm/uqm-0.7.0-r1.ebuild
+++ b/games-strategy/uqm/uqm-0.7.0-r1.ebuild
@@ -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/games-strategy/uqm/uqm-0.7.0-r1.ebuild,v 1.3 2012/07/03 11:14:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/uqm/uqm-0.7.0-r1.ebuild,v 1.4 2012/07/09 04:52:43 josejx Exp $
EAPI=2
inherit eutils multilib games
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/sc2/${P}-source.tgz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE="music opengl remix voice"
RDEPEND="media-libs/libvorbis
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 0eacbdb60db9..17468cd0e998 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,6 +1,4 @@
-DIST evolution-data-server-2.32.3-patches.tar.xz 24072 RMD160 2508b5b101f59bb383020728a8abb9ee2eb7836d SHA1 76b86f747415c117c660ec70561a786ff772d2b2 SHA256 7b1f29fad87a7e868736380c69880a29ddf5d4bd365734df53042e4bc9e8b0fa
-DIST evolution-data-server-2.32.3.tar.bz2 4322281 RMD160 adc8b07aef41a89d16fc426541c12190a3688b8f SHA1 cbf32c3438c4f1650b35b87007a337ebc1c56cec SHA256 744026a745b711b3e393b61fed21c4926d1b10a3aa7da64f4b33a3e3bf5b085c
-DIST evolution-data-server-3.2.3.tar.xz 3729592 RMD160 9c352af61ff65592dd40928bbdb9ce0cf262046c SHA1 b96936bbeae52eb35113003f7d4e96f09a4fef25 SHA256 8760814491fa1ecf8806b31231b30c5f20169790abdc6b78a2faa194fde3987c
-DIST evolution-data-server-3.4.1.tar.xz 3877120 RMD160 6c21f67daf5504d7a3dbb2333c08b2a5285fc109 SHA1 cd04235696a793f9fda54dfb68c9789e589be06e SHA256 378c4eedb11ea359c49734393ba764ac1f1230b298c36d2256129dae00c78298
-DIST evolution-data-server-3.4.2.tar.xz 3879040 RMD160 01be750debfb5e3daf2b92ab0f01a25791fa9cb3 SHA1 fe1cba6f54b18eefae2472d6588496873ac5c0be SHA256 9020337a8ce02ae13c2bcbab80784bfbc6b73803d91a3cacc6362426036f6285
-DIST evolution-data-server-3.4.3.tar.xz 3645752 RMD160 9b33dc19e572db7bee292e38e73d36135fa148a8 SHA1 40fc66ca36977a5a35fcebfb9997c3a5fe86ef18 SHA256 455d0ee5ba5f1638f593476427697c9b5fc9668389b18f170449710f711626d8
+DIST evolution-data-server-2.32.3-patches.tar.xz 24072 SHA256 7b1f29fad87a7e868736380c69880a29ddf5d4bd365734df53042e4bc9e8b0fa SHA512 20e12257e7153d074f20c158fc16a5a8feed8e9ed34035c6d752e31ca5b21436e08d767433aa16b885ad0aa8a95b18b41f79c80f2b30db42a5af402082882d55 WHIRLPOOL 660000ccaa0160325b92cf26ea031c96190645ce4bd2a6fc83b03411c6a2bb7f7aadc0ca0a493e1ff386fd4ac4471035af2da0decb436db7f8cf74b792ac4bd2
+DIST evolution-data-server-2.32.3.tar.bz2 4322281 SHA256 744026a745b711b3e393b61fed21c4926d1b10a3aa7da64f4b33a3e3bf5b085c SHA512 863ccea7717a7fe743155513e74fc8ea35f558702bd4ff1075e15d1a36c1ecd9d5e285bd2a81245d680c05cf0521029583134b4e1d12668244042df3f5e62dfb WHIRLPOOL 3c56210f477901c3ea2d4712e631d219969cb113ff1c4cba3fcefccb67fed363a6207025b46922b9c1f6ba3427b962b5e0565c6b1441249c74b29afa314e3580
+DIST evolution-data-server-3.2.3.tar.xz 3729592 SHA256 8760814491fa1ecf8806b31231b30c5f20169790abdc6b78a2faa194fde3987c
+DIST evolution-data-server-3.4.3.tar.xz 3645752 SHA256 455d0ee5ba5f1638f593476427697c9b5fc9668389b18f170449710f711626d8
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild
index f17f1531e5fa..c11631440069 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild
@@ -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/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild,v 1.9 2012/05/24 13:53:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild,v 1.10 2012/07/08 11:30:29 pacho Exp $
EAPI="4"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
GNOME_TARBALL_SUFFIX="bz2"
+WANT_AUTOMAKE="1.11"
inherit autotools db-use eutils flag-o-matic gnome2 versionator virtualx
@@ -104,7 +105,8 @@ src_prepare() {
sed 's/^\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
-i configure.ac configure || die "sed 3 failed"
- intltoolize --force --copy --automake || die "intltoolize failed"
+ sed -e "/AM_INIT_AUTOMAKE/s/-Werror//" -i configure.ac || die
+
eautoreconf
gnome2_src_prepare
}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r1.ebuild
deleted file mode 100644
index 32849a8791ce..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r1.ebuild,v 1.2 2012/05/05 06:25:24 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools db-use eutils flag-o-matic gnome2 versionator virtualx
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-
-LICENSE="LGPL-2 BSD DB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-IUSE="doc +gnome-online-accounts +introspection ipv6 ldap kerberos vala +weather"
-
-# GNOME3: How do we slot libedataserverui-3.0.so?
-# Also, libedata-cal-1.2.so and libecal-1.2.so use gtk-3, but aren't slotted
-RDEPEND=">=dev-libs/glib-2.28:2
- >=x11-libs/gtk+-3.0:3
- >=gnome-base/gconf-2
- >=dev-db/sqlite-3.5
- >=dev-libs/libgdata-0.9.1
- >=gnome-base/gnome-keyring-2.20.1
- >=dev-libs/libical-0.43
- >=net-libs/libsoup-2.31.2:2.4
- >=dev-libs/libxml2-2
- >=dev-libs/nspr-4.4
- >=dev-libs/nss-3.9
- >=sys-libs/db-4
- sys-libs/zlib
- virtual/libiconv
- gnome-online-accounts? (
- >=net-libs/gnome-online-accounts-3.1.1
- >=net-libs/liboauth-0.9.4 )
- introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
- kerberos? ( virtual/krb5 )
- ldap? ( >=net-nds/openldap-2 )
- weather? ( >=dev-libs/libgweather-2.90.0:2 )
-"
-DEPEND="${RDEPEND}
- dev-lang/perl
- dev-util/gperf
- virtual/pkgconfig
- >=dev-util/intltool-0.35.5
- sys-devel/bison
- >=gnome-base/gnome-common-2
- >=dev-util/gtk-doc-am-1.9
- >=sys-devel/gettext-0.17
- doc? ( >=dev-util/gtk-doc-1.9 )
- vala? ( >=dev-lang/vala-0.13.0:0.14[vapigen] )"
-# eautoreconf needs:
-# >=gnome-base/gnome-common-2
-# >=dev-util/gtk-doc-am-1.9
-
-REQUIRED_USE="vala? ( introspection )"
-
-# FIXME
-RESTRICT="test"
-
-pkg_setup() {
- DOCS="ChangeLog MAINTAINERS NEWS TODO"
- # Uh, what to do about dbus-call-timeout ?
- # Fails to build with --disable-ssl; bug #392679, https://bugzilla.gnome.org/show_bug.cgi?id=642984
- G2CONF="${G2CONF}
- VALAC=$(type -P valac-0.14)
- VAPIGEN=$(type -P vapigen-0.14)
- $(use_enable gnome-online-accounts goa)
- $(use_enable introspection)
- $(use_enable ipv6)
- $(use_with kerberos krb5 ${EPREFIX}/usr)
- $(use_with ldap openldap)
- $(use_enable vala vala-bindings)
- $(use_enable weather)
- --enable-calendar
- --enable-largefile
- --enable-nntp
- --enable-ssl
- --enable-smime
- --with-libdb=${EPREFIX}/usr"
-}
-
-src_prepare() {
- # fix linking with glib-2.31, bug #395777
- epatch "${FILESDIR}/${PN}-3.2.2-gmodule-explicit.patch"
- epatch "${FILESDIR}/${PN}-3.2.2-g_thread_init.patch"
- # fix caldav quoting problems with libical-0.48, bug #405647
- epatch "${FILESDIR}/${P}-caldav-cannot-modify.patch"
-
- eautoreconf
-
- gnome2_src_prepare
-
- # GNOME bug 611353 (skips failing test atm)
- # XXX: uncomment when there's a proper fix
- #epatch "${FILESDIR}/e-d-s-camel-skip-failing-test.patch"
-
- # GNOME bug 621763 (skip failing test-ebook-stress-factory--fifo)
- #sed -e 's/\(SUBDIRS =.*\)ebook/\1/' \
- # -i addressbook/tests/Makefile.{am,in} \
- # || die "failing test sed 1 failed"
-
- # /usr/include/db.h is always db-1 on FreeBSD
- # so include the right dir in CPPFLAGS
- append-cppflags "-I$(db_includedir)"
-}
-
-src_install() {
- # Prevent this evolution-data-server from linking to libs in the installed
- # evolution-data-server libraries by adding -L arguments for build dirs to
- # every .la file's relink_command field, forcing libtool to look there
- # first during relinking. This will mangle the .la files installed by
- # make install, but we don't care because we will be punting them anyway.
- perl "${FILESDIR}/fix_relink_command.pl" . ||
- die "fix_relink_command.pl failed"
- gnome2_src_install
-
- if use ldap; then
- MY_MAJORV=$(get_version_component_range 1-2)
- insinto /etc/openldap/schema
- doins "${FILESDIR}"/calentry.schema || die "doins failed"
- dosym /usr/share/${PN}-${MY_MAJORV}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
- fi
-}
-
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- unset ORBIT_SOCKETDIR
- unset SESSION_MANAGER
- export XDG_DATA_HOME="${T}"
- unset DISPLAY
- Xemake check || die "Tests failed."
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- if use ldap; then
- elog ""
- elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema"
- fi
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.4.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.4.1.ebuild
deleted file mode 100644
index 768ff3b140d1..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.4.1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.4.1.ebuild,v 1.1 2012/05/07 05:58:06 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit db-use eutils flag-o-matic gnome2 versionator virtualx
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-
-LICENSE="LGPL-2 BSD DB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-IUSE="doc +gnome-online-accounts +introspection ipv6 ldap kerberos vala +weather"
-
-RDEPEND=">=dev-libs/glib-2.30:2
- >=x11-libs/gtk+-3.2:3
- >=gnome-base/gconf-2
- >=dev-db/sqlite-3.5
- >=dev-libs/libgdata-0.10
- >=gnome-base/gnome-keyring-2.20.1
- >=dev-libs/dbus-glib-0.6
- >=dev-libs/libical-0.43
- >=net-libs/libsoup-2.31.2:2.4
- >=dev-libs/libxml2-2
- >=sys-libs/db-4
- >=dev-libs/nspr-4.4
- >=dev-libs/nss-3.9
-
- sys-libs/zlib
- virtual/libiconv
-
- gnome-online-accounts? (
- >=net-libs/gnome-online-accounts-3.1.1
- >=net-libs/liboauth-0.9.4 )
- introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
- kerberos? ( virtual/krb5 )
- ldap? ( >=net-nds/openldap-2 )
- weather? ( >=dev-libs/libgweather-2.90.0:2 )
-"
-DEPEND="${RDEPEND}
- dev-lang/perl
- dev-util/gperf
- >=dev-util/intltool-0.35.5
- sys-devel/bison
- >=gnome-base/gnome-common-2
- >=dev-util/gtk-doc-am-1.9
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- doc? ( >=dev-util/gtk-doc-1.14 )
- vala? ( >=dev-lang/vala-0.13.0:0.14[vapigen] )"
-# eautoreconf needs:
-# >=gnome-base/gnome-common-2
-# >=dev-util/gtk-doc-am-1.9
-
-REQUIRED_USE="vala? ( introspection )"
-
-# FIXME
-RESTRICT="test"
-
-pkg_setup() {
- DOCS="ChangeLog MAINTAINERS NEWS TODO"
- # Uh, what to do about dbus-call-timeout ?
- G2CONF="${G2CONF}
- --disable-schemas-compile
- VALAC=$(type -P valac-0.14)
- VAPIGEN=$(type -P vapigen-0.14)
- $(use_enable gnome-online-accounts goa)
- $(use_enable introspection)
- $(use_enable ipv6)
- $(use_with kerberos krb5 ${EPREFIX}/usr)
- $(use_with ldap openldap)
- $(use_enable vala vala-bindings)
- $(use_enable weather)
- --enable-nntp
- --enable-largefile
- --enable-smime
- --with-libdb=${EPREFIX}/usr"
-}
-
-src_prepare() {
- gnome2_src_prepare
-
- # GNOME bug 611353 (skips failing test atm)
- # XXX: uncomment when there's a proper fix
- #epatch "${FILESDIR}/e-d-s-camel-skip-failing-test.patch"
-
- # GNOME bug 621763 (skip failing test-ebook-stress-factory--fifo)
- #sed -e 's/\(SUBDIRS =.*\)ebook/\1/' \
- # -i addressbook/tests/Makefile.{am,in} \
- # || die "failing test sed 1 failed"
-
- # /usr/include/db.h is always db-1 on FreeBSD
- # so include the right dir in CPPFLAGS
- append-cppflags "-I$(db_includedir)"
-
- # FIXME: Fix compilation flags crazyness
- # Touch configure.ac if doing eautoreconf
- sed 's/^\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
- -i configure || die "sed failed"
-}
-
-src_install() {
- # Prevent this evolution-data-server from linking to libs in the installed
- # evolution-data-server libraries by adding -L arguments for build dirs to
- # every .la file's relink_command field, forcing libtool to look there
- # first during relinking. This will mangle the .la files installed by
- # make install, but we don't care because we will be punting them anyway.
- perl "${FILESDIR}/fix_relink_command.pl" . ||
- die "fix_relink_command.pl failed"
- gnome2_src_install
-
- if use ldap; then
- MY_MAJORV=$(get_version_component_range 1-2)
- insinto /etc/openldap/schema
- doins "${FILESDIR}"/calentry.schema || die "doins failed"
- dosym /usr/share/${PN}-${MY_MAJORV}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
- fi
-}
-
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- unset ORBIT_SOCKETDIR
- unset SESSION_MANAGER
- export XDG_DATA_HOME="${T}"
- unset DISPLAY
- Xemake check || die "Tests failed."
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- if use ldap; then
- elog ""
- elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema"
- fi
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.4.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.4.2.ebuild
deleted file mode 100644
index 22304defed4d..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.4.2.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.4.2.ebuild,v 1.1 2012/05/20 10:44:45 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit db-use eutils flag-o-matic gnome2 versionator virtualx
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-
-LICENSE="LGPL-2 BSD DB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-IUSE="doc +gnome-online-accounts +introspection ipv6 ldap kerberos vala +weather"
-
-RDEPEND=">=dev-libs/glib-2.30:2
- >=x11-libs/gtk+-3.2:3
- >=gnome-base/gconf-2
- >=dev-db/sqlite-3.5
- >=dev-libs/libgdata-0.10
- >=gnome-base/gnome-keyring-2.20.1
- >=dev-libs/dbus-glib-0.6
- >=dev-libs/libical-0.43
- >=net-libs/libsoup-2.31.2:2.4
- >=dev-libs/libxml2-2
- >=sys-libs/db-4
- >=dev-libs/nspr-4.4
- >=dev-libs/nss-3.9
-
- sys-libs/zlib
- virtual/libiconv
-
- gnome-online-accounts? (
- >=net-libs/gnome-online-accounts-3.1.1
- >=net-libs/liboauth-0.9.4 )
- introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
- kerberos? ( virtual/krb5 )
- ldap? ( >=net-nds/openldap-2 )
- weather? ( >=dev-libs/libgweather-2.90.0:2 )
-"
-DEPEND="${RDEPEND}
- dev-lang/perl
- dev-util/gperf
- >=dev-util/intltool-0.35.5
- sys-devel/bison
- >=gnome-base/gnome-common-2
- >=dev-util/gtk-doc-am-1.9
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- doc? ( >=dev-util/gtk-doc-1.14 )
- vala? ( >=dev-lang/vala-0.13.0:0.14[vapigen] )"
-# eautoreconf needs:
-# >=gnome-base/gnome-common-2
-# >=dev-util/gtk-doc-am-1.9
-
-REQUIRED_USE="vala? ( introspection )"
-
-# FIXME
-RESTRICT="test"
-
-pkg_setup() {
- DOCS="ChangeLog MAINTAINERS NEWS TODO"
- # Uh, what to do about dbus-call-timeout ?
- G2CONF="${G2CONF}
- --disable-schemas-compile
- VALAC=$(type -P valac-0.14)
- VAPIGEN=$(type -P vapigen-0.14)
- $(use_enable gnome-online-accounts goa)
- $(use_enable introspection)
- $(use_enable ipv6)
- $(use_with kerberos krb5 ${EPREFIX}/usr)
- $(use_with ldap openldap)
- $(use_enable vala vala-bindings)
- $(use_enable weather)
- --enable-nntp
- --enable-largefile
- --enable-smime
- --with-libdb=${EPREFIX}/usr"
-}
-
-src_prepare() {
- gnome2_src_prepare
-
- # GNOME bug 611353 (skips failing test atm)
- # XXX: uncomment when there's a proper fix
- #epatch "${FILESDIR}/e-d-s-camel-skip-failing-test.patch"
-
- # GNOME bug 621763 (skip failing test-ebook-stress-factory--fifo)
- #sed -e 's/\(SUBDIRS =.*\)ebook/\1/' \
- # -i addressbook/tests/Makefile.{am,in} \
- # || die "failing test sed 1 failed"
-
- # /usr/include/db.h is always db-1 on FreeBSD
- # so include the right dir in CPPFLAGS
- append-cppflags "-I$(db_includedir)"
-
- # FIXME: Fix compilation flags crazyness
- # Touch configure.ac if doing eautoreconf
- sed 's/^\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
- -i configure || die "sed failed"
-}
-
-src_install() {
- # Prevent this evolution-data-server from linking to libs in the installed
- # evolution-data-server libraries by adding -L arguments for build dirs to
- # every .la file's relink_command field, forcing libtool to look there
- # first during relinking. This will mangle the .la files installed by
- # make install, but we don't care because we will be punting them anyway.
- perl "${FILESDIR}/fix_relink_command.pl" . ||
- die "fix_relink_command.pl failed"
- gnome2_src_install
-
- if use ldap; then
- MY_MAJORV=$(get_version_component_range 1-2)
- insinto /etc/openldap/schema
- doins "${FILESDIR}"/calentry.schema || die "doins failed"
- dosym /usr/share/${PN}-${MY_MAJORV}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
- fi
-}
-
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- unset ORBIT_SOCKETDIR
- unset SESSION_MANAGER
- export XDG_DATA_HOME="${T}"
- unset DISPLAY
- Xemake check || die "Tests failed."
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- if use ldap; then
- elog ""
- elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema"
- fi
-}
diff --git a/gnome-extra/gnome-color-manager/Manifest b/gnome-extra/gnome-color-manager/Manifest
index f09216703ecd..be355240fa16 100644
--- a/gnome-extra/gnome-color-manager/Manifest
+++ b/gnome-extra/gnome-color-manager/Manifest
@@ -1,4 +1,4 @@
-DIST gnome-color-manager-2.32.0.tar.bz2 2491525 RMD160 6ad3b2d3a4cd84ba78988411d7402abca46aebcf SHA1 18cdc922188c2872c5e0c32b215e6cbea878e289 SHA256 fa287ef12d329643d1f01b8f35c2b104dd293cd30e91a012f04929c203da54cf
-DIST gnome-color-manager-3.2.3.tar.xz 2495852 RMD160 30ee004cfaf79f65db7991a69a05974ad3f871eb SHA1 a2f34b2a339d4aa7ae611d59cb1bea28f00c58b9 SHA256 5fc3073f97df5ddd98e2e85d75e9f4763129e62a565568c7b3c48aa6cf8cdb36
-DIST gnome-color-manager-3.2.4.tar.xz 2496792 RMD160 a4599e9fd1357b710565c1979bbc3d46db06940f SHA1 f21adf1c5d202f8279da1f218ef35df57e695481 SHA256 3b6146edf551b3cff9313658f9deccc5a7a595718b1e14313011ff5a0f1b2137
-DIST gnome-color-manager-3.4.2.tar.xz 2520548 RMD160 cd09904b4d037e38a2b034bae35879eb43adb14b SHA1 143644a936e0847aa6508ca2aa34e2099d74470c SHA256 ad69ac0ac242be0ad5b7966e0c2978a9a1440e52ee816993e4a8eb2cf6f0c922
+DIST gnome-color-manager-2.32.0.tar.bz2 2491525 SHA256 fa287ef12d329643d1f01b8f35c2b104dd293cd30e91a012f04929c203da54cf
+DIST gnome-color-manager-3.2.3.tar.xz 2495852 SHA256 5fc3073f97df5ddd98e2e85d75e9f4763129e62a565568c7b3c48aa6cf8cdb36
+DIST gnome-color-manager-3.2.4.tar.xz 2496792 SHA256 3b6146edf551b3cff9313658f9deccc5a7a595718b1e14313011ff5a0f1b2137
+DIST gnome-color-manager-3.4.2.tar.xz 2520548 SHA256 ad69ac0ac242be0ad5b7966e0c2978a9a1440e52ee816993e4a8eb2cf6f0c922
diff --git a/gnome-extra/gnome-color-manager/metadata.xml b/gnome-extra/gnome-color-manager/metadata.xml
index 5b767331ebde..b244738d263c 100644
--- a/gnome-extra/gnome-color-manager/metadata.xml
+++ b/gnome-extra/gnome-color-manager/metadata.xml
@@ -1,10 +1,6 @@
-
- flameeyes@gentoo.org
- Diego Elio Pettenò
-
gnome