diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index 7163e31818b6..5ae6995967eb 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -1,3 +1,3 @@
DIST dpkg_1.17.23.tar.xz 4386124 SHA256 90c4af92fc248a7542cf6db1141d69b042130abd82781943b3c2608e78f860b5 SHA512 b0ebb6d072135f8eb0504084aab38d1f7366dd2bbf4a28a66f7fda5777236f56eb14dd43f8b5cd5ab8dd5d467e48b398221a271c2cb52360d09c7b7cec0e531a WHIRLPOOL cda6fab0c05e12a077a1c7c66883c85646b9f45ece209925947583a4f452f54750253249e21c2b650c13e57c4bfbb82caf807ab00a9163dd1db4bc289c874a04
-DIST dpkg_1.17.24.tar.xz 4388276 SHA256 afd60233ef090aa5a4d9e181b8986d1f5deb23a3428a2309b6b4ec448d539eac SHA512 4ec8e55f765cd6718f9ea76ac4d0ba37d007a94a06a9ce91a5958feb4641c93dca4b5da8de2e7ddd0775e7e0a00ac3d9f11445489249f724edee6bc9c3a31332 WHIRLPOOL 37113575147e9f8030b0845353596a6e193370cc0b13b785a5a37d08762c27afae857f554ed4da09c4aa1146b6002533f72da7b8ab681ca32292bbc0b83cc3a8
DIST dpkg_1.17.25.tar.xz 4407792 SHA256 07019d38ae98fb107c79dbb3690cfadff877f153b8c4970e3a30d2e59aa66baa SHA512 6a4b45c0f59cd11fc104d954ab790dd7e11e650cd6dde303a664023a04bf6fbc49c878eaf00e27dd7f9bf5e79a92b3a5f5923d003942436758a3027364a0b7c7 WHIRLPOOL 6ed2d8a645787a83f431803214cce9b1c7516c4083ffe651deb7c2f8b641b85d3a17271030286155a985dfd0046fbd584d2d750ab8954e8e5af74085d7651bd2
+DIST dpkg_1.18.0.tar.xz 4330304 SHA256 7b156fbeed5bbfb8aa546a18badb46e471b65fa00777ccd8d7e3bbce002f225a SHA512 8d51082707929d682a04e74843ba941ed66f992d592453e73bd267ba0cfe0c30e07c48c1188519c58d93ca9928631de7c915d34d126e07b81447d3380bd4fc89 WHIRLPOOL d9816e9ba6be50c3ffa29f1ff138f4cecb837b42803780f23217e5f876822cb89a482196df9c2554973c7ac5b236be97355a7f4c6aa56adcb5daf104f05ba2c8
diff --git a/app-arch/dpkg/dpkg-1.17.24.ebuild b/app-arch/dpkg/dpkg-1.18.0.ebuild
similarity index 95%
rename from app-arch/dpkg/dpkg-1.17.24.ebuild
rename to app-arch/dpkg/dpkg-1.18.0.ebuild
index 7250c8f91acc..2ce7a232c1a3 100644
--- a/app-arch/dpkg/dpkg-1.17.24.ebuild
+++ b/app-arch/dpkg/dpkg-1.18.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.17.24.ebuild,v 1.1 2015/03/04 14:11:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.18.0.ebuild,v 1.1 2015/05/19 04:28:19 jer Exp $
EAPI=5
inherit eutils multilib autotools toolchain-funcs
diff --git a/app-cdr/cdck/cdck-0.7.0.ebuild b/app-cdr/cdck/cdck-0.7.0-r1.ebuild
similarity index 58%
rename from app-cdr/cdck/cdck-0.7.0.ebuild
rename to app-cdr/cdck/cdck-0.7.0-r1.ebuild
index 10d3f3b2a1e5..ca9b57990b3d 100644
--- a/app-cdr/cdck/cdck-0.7.0.ebuild
+++ b/app-cdr/cdck/cdck-0.7.0-r1.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdck/cdck-0.7.0.ebuild,v 1.1 2008/06/15 17:18:41 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdck/cdck-0.7.0-r1.ebuild,v 1.2 2015/05/18 19:12:51 zzam Exp $
-DESCRIPTION="CD/DVD check tools"
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Measure the read time per sector on CD or DVD to check the quality"
HOMEPAGE="http://swaj.net/unix/index.html#cdck"
SRC_URI="http://swaj.net/unix/cdck/${P}.tar.gz"
@@ -11,9 +14,16 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-src_compile() {
+src_prepare() {
+ sed -e '1d' -i man/cdck_man.in || die "sed failed"
+}
+
+src_configure() {
econf --disable-dependency-tracking \
--disable-shared || die "econf failed."
+}
+
+src_compile() {
emake -j1 || die "emake failed."
}
diff --git a/app-cdr/cdck/metadata.xml b/app-cdr/cdck/metadata.xml
index e6768f32d9b3..33e32af6ee6b 100644
--- a/app-cdr/cdck/metadata.xml
+++ b/app-cdr/cdck/metadata.xml
@@ -1,9 +1,19 @@
-media-optical
-
-zzam@gentoo.org
-Matthias Schwarzott
-
+ media-optical
+
+ zzam@gentoo.org
+ Matthias Schwarzott
+
+
+ Actually cdck is a simple program to verify CD/DVD quality. The known
+ fact is that even if all files on the disc are readable, some sectors
+ having bad timing can easily turn into unreadable ones in the future.
+
+ To get an idea about disc cdck reads it sector by sector, keeping all
+ reading timings and then tells you its verdict. Optionally it can write
+ timing table into text file usable by gnuplot(1) program, so you can draw
+ some graphs out of it.
+
diff --git a/app-office/scribus/files/scribus-1.4.4-ppc64-fpic.patch b/app-office/scribus/files/scribus-1.4.4-ppc64-fpic.patch
new file mode 100644
index 000000000000..295cec391286
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.4.4-ppc64-fpic.patch
@@ -0,0 +1,19 @@
+ scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt b/scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt
+index 18898a7..ba872b9 100755
+--- a/scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt
++++ b/scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt
+@@ -18,9 +18,9 @@ SET(2GEOM_VERSION 0.1.0)
+ # http://www.gentoo.org/proj/en/base/amd64/howtos/index.xml?part=1&chap=3 and
+ # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559133
+
+-IF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1)
++IF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+-ENDIF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1)
++ENDIF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)
+
+ OPTION(2GEOM_BUILD_SHARED
+ "Build lib2geom and libtoy as shared libraries."
diff --git a/app-office/scribus/files/scribus-1.5.0-docs.patch b/app-office/scribus/files/scribus-1.5.0-docs.patch
index 831323847314..b566f3f6890c 100644
--- a/app-office/scribus/files/scribus-1.5.0-docs.patch
+++ b/app-office/scribus/files/scribus-1.5.0-docs.patch
@@ -1,24 +1,21 @@
- CMakeLists.txt | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c97080b..46742c7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -244,7 +244,7 @@ ELSE (WIN32 OR OS2)
- SET(DOCDIR "share/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
- ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE)
- IF(NOT WANT_VERSIONING)
-- SET(DOCDIR "share/doc/${MAIN_DIR_NAME}/")
-+ SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${GENTOOVERSION}/")
- ELSE(NOT WANT_VERSIONING)
- SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${VERSION}/")
- ENDIF(NOT WANT_VERSIONING)
-@@ -883,7 +883,6 @@ INSTALL(FILES
- BUILDING
- ChangeLog
- ChangeLogSVN
-- COPYING
- LINKS
- NEWS
- PACKAGING
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt (revision 20042)
++++ CMakeLists.txt (working copy)
+@@ -247,15 +247,7 @@
+ IF(WIN32 OR OS2)
+ SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
+ ELSE (WIN32 OR OS2)
+- IF(TAG_VERSION OR BUILD_OSX_BUNDLE)
+- SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
+- ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE)
+- IF(NOT WANT_VERSIONING)
+- SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
+- ELSE(NOT WANT_VERSIONING)
+- SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
+- ENDIF(NOT WANT_VERSIONING)
+- ENDIF (TAG_VERSION OR BUILD_OSX_BUNDLE)
++ SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${GENTOOVERSION}/")
+ ENDIF (WIN32 OR OS2)
+ IF(NOT IS_ABSOLUTE ${DOCDIR})
+ ADD_DEFINITIONS("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"")
diff --git a/app-office/scribus/scribus-1.4.4-r1.ebuild b/app-office/scribus/scribus-1.4.4-r1.ebuild
index eda96284fa67..5220135a4c0f 100644
--- a/app-office/scribus/scribus-1.4.4-r1.ebuild
+++ b/app-office/scribus/scribus-1.4.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.4-r1.ebuild,v 1.6 2015/04/18 15:55:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.4-r1.ebuild,v 1.8 2015/05/19 04:54:51 jer Exp $
EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 hppa ppc ppc64 ~sparc x86"
IUSE="cairo debug examples hunspell +minimal +pdf scripts templates tk"
# a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a}
@@ -56,6 +56,7 @@ DEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-1.4.2-docs.patch
"${FILESDIR}"/${PN}-1.4.0-minizip.patch
+ "${FILESDIR}"/${P}-ppc64-fpic.patch
)
src_prepare() {
diff --git a/app-office/scribus/scribus-1.4.5-r1.ebuild b/app-office/scribus/scribus-1.4.5-r1.ebuild
new file mode 100644
index 000000000000..24acf5ee6b73
--- /dev/null
+++ b/app-office/scribus/scribus-1.4.5-r1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.5-r1.ebuild,v 1.1 2015/05/18 16:56:51 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk?"
+
+inherit cmake-utils fdo-mime python-single-r1
+
+DESCRIPTION="Desktop publishing (DTP) and layout program"
+HOMEPAGE="http://www.scribus.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cairo debug examples hunspell +minimal +pdf scripts templates tk"
+
+# a=$((ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'| awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_: :g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e 's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a
+IUSE_LINGUAS=" af ar bg br ca ca_ES cs cs_CZ cy cy_GB da da_DK de de_1901 de_CH de_DE el en en_AU en_EN en_GB en_US eo es es_ES et eu fi fi_FI fr gl he hr hu hu_HU ia id id_ID is is_IS it ja ko ku la lt lt_LT nb_NO nl nn_NO pl pl_PL pt pt_BR pt_PT ro ro_RO ru ru_RU_0 sa sk sk_SK sl sl_SI sq sr sv sv_SE th_TH tr uk uk_UA zh_CN zh_TW"
+IUSE+=" ${IUSE_LINGUAS// / linguas_}"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ tk? ( scripts )"
+
+COMMON_DEPEND="
+ ${PYTHON_DEPS}
+ dev-libs/boost
+ dev-libs/hyphen
+ dev-libs/libxml2
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ media-libs/fontconfig
+ media-libs/freetype:2
+ media-libs/lcms:2
+ media-libs/libpng:0
+ media-libs/tiff:0
+ net-print/cups
+ sys-libs/zlib[minizip]
+ virtual/jpeg:0=
+ cairo? ( x11-libs/cairo[X,svg] )
+ !cairo? ( media-libs/libart_lgpl )
+ hunspell? ( app-text/hunspell )
+ pdf? ( app-text/podofo )
+ scripts? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
+ tk? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+ app-text/ghostscript-gpl"
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.4.2-docs.patch
+ "${FILESDIR}"/${PN}-1.4.0-minizip.patch
+ )
+
+src_prepare() {
+ cat > cmake/modules/FindZLIB.cmake <<- EOF
+ find_package(PkgConfig)
+ pkg_check_modules(ZLIB minizip zlib)
+ SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} )
+ SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} )
+ MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
+ EOF
+
+ rm scribus/{ioapi,unzip}.[ch] || die
+
+ sed \
+ -e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
+ -i resources/templates/CMakeLists.txt || die
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local lang langs
+ for lang in ${IUSE_LINGUAS}; do
+ if use linguas_${lang}; then
+ # From the CMakeLists.txt
+ # "#Bit of a hack, preprocess all the filenames to generate our language string, needed for -DWANT_GUI_LANG=en_GB,de_DE , etc"
+ langs+=";${lang}"
+ else
+ # Don't install localized documentation
+ sed -e "/${lang}/d" -i scribus/doc/CMakeLists.txt || die
+ safe_delete file ./resources/dicts/README_${lang}.txt
+ safe_delete file ./resources/dicts/README_hyph_${lang}.txt
+ safe_delete file ./resources/dicts/hyph_${lang}.dic
+ safe_delete file ./resources/loremipsum/${lang}.xml
+ fi
+ done
+
+ local mycmakeargs=(
+ -DHAVE_PYTHON=ON
+ -DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
+ -DPYTHON_LIBRARY="$(python_get_library_path)"
+ -DWANT_NORPATH=ON
+ -DWANT_QT3SUPPORT=OFF
+ -DGENTOOVERSION=${PVR}
+ -DWANT_GUI_LANG=${langs#,}
+ $(cmake-utils_use_with pdf PODOFO)
+ $(cmake-utils_use_want cairo)
+ $(cmake-utils_use_want !cairo QTARTHUR)
+ $(cmake-utils_use_want debug DEBUG)
+ $(cmake-utils_use_want minimal NOHEADERINSTALL)
+ $(cmake-utils_use_want hunspell HUNSPELL)
+ $(cmake-utils_use_want !examples NOEXAMPLES)
+ $(cmake-utils_use_want !templates NOTEMPLATES)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ local lang
+ for lang in ${IUSE_LINGUAS}; do
+ if ! use linguas_${lang}; then
+ safe_delete dir "${ED}"/usr/share/man/${lang}
+ fi
+ done
+
+ if ! use scripts; then
+ rm "${ED}"/usr/share/scribus/scripts/*.py || die
+ elif ! use tk; then
+ rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
+ fi
+
+ python_fix_shebang "${ED}"/usr/share/scribus/scripts
+ python_optimize "${ED}"/usr/share/scribus/scripts
+
+ mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
+ ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
+ cat >> "${T}"/COPYING <<- EOF
+ ${PN} is licensed under the "${LICENSE}".
+ Please visit http://www.gnu.org/licenses/gpl-2.0.html for the complete license text.
+ EOF
+ dodoc "${T}"/COPYING
+ docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING}
+ doicon resources/icons/scribus.png
+ domenu scribus.desktop
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
+}
+
+safe_delete () {
+ case $1 in
+ dir)
+ if [[ -d "${2}" ]]; then
+ rm -r "${2}" || die
+ fi
+ ;;
+ file)
+ if [[ -f "${2}" ]]; then
+ rm "${2}" || die
+ fi
+ ;;
+ *)
+ die "Wrong usage"
+ esac
+}
diff --git a/app-office/scribus/scribus-1.4.9999.ebuild b/app-office/scribus/scribus-1.4.9999.ebuild
index 7cfafaef05d3..ec3f1ab9e9d7 100644
--- a/app-office/scribus/scribus-1.4.9999.ebuild
+++ b/app-office/scribus/scribus-1.4.9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild,v 1.11 2015/04/12 14:51:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild,v 1.12 2015/05/18 16:56:51 jlec Exp $
EAPI=5
@@ -20,8 +20,8 @@ SLOT="0"
KEYWORDS=""
IUSE="cairo debug examples hunspell +minimal +pdf scripts templates tk"
-# a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a}
-IUSE_LINGUAS=" af ar bg br ca cs_CZ cy da_DK de de_1901 de_CH el en_AU en_GB en_US eo es_ES et eu fi fr gl hu id it ja ko lt_LT nb_NO nl pl_PL pt pt_BR ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW"
+# a=$((ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'| awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_: :g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e 's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a
+IUSE_LINGUAS=" af ar bg br ca ca_ES cs cs_CZ cy cy_GB da da_DK de de_1901 de_CH de_DE el en en_AU en_EN en_GB en_US eo es es_ES et eu fi fi_FI fr gl he hr hu hu_HU ia id id_ID is is_IS it ja ko ku la lt lt_LT nb_NO nl nn_NO pl pl_PL pt pt_BR pt_PT ro ro_RO ru ru_RU_0 sa sk sk_SK sl sl_SI sq sr sv sv_SE th_TH tr uk uk_UA zh_CN zh_TW"
IUSE+=" ${IUSE_LINGUAS// / linguas_}"
REQUIRED_USE="
@@ -86,9 +86,16 @@ src_configure() {
local lang langs
for lang in ${IUSE_LINGUAS}; do
if use linguas_${lang}; then
- langs+=",${lang}"
+ # From the CMakeLists.txt
+ # "#Bit of a hack, preprocess all the filenames to generate our language string, needed for -DWANT_GUI_LANG=en_GB,de_DE , etc"
+ langs+=";${lang}"
else
+ # Don't install localized documentation
sed -e "/${lang}/d" -i scribus/doc/CMakeLists.txt || die
+ safe_delete file ./resources/dicts/README_${lang}.txt
+ safe_delete file ./resources/dicts/README_hyph_${lang}.txt
+ safe_delete file ./resources/dicts/hyph_${lang}.dic
+ safe_delete file ./resources/loremipsum/${lang}.xml
fi
done
@@ -115,11 +122,10 @@ src_configure() {
src_install() {
cmake-utils_src_install
- local lang file
+ local lang
for lang in ${IUSE_LINGUAS}; do
- file="${ED}"/usr/share/scribus/translations/scribus.${lang}.qm
- if ! use linguas_${lang} && [[ -f "${file}" ]]; then
- rm "${file}" || die
+ if ! use linguas_${lang}; then
+ safe_delete dir "${ED}"/usr/share/man/${lang}
fi
done
@@ -153,3 +159,20 @@ pkg_postrm() {
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
}
+
+safe_delete () {
+ case $1 in
+ dir)
+ if [[ -d "${2}" ]]; then
+ rm -r "${2}" || die
+ fi
+ ;;
+ file)
+ if [[ -f "${2}" ]]; then
+ rm "${2}" || die
+ fi
+ ;;
+ *)
+ die "Wrong usage"
+ esac
+}
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index aeb3cb297c35..247123615f81 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v 1.13 2015/04/12 14:51:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v 1.14 2015/05/18 16:56:51 jlec Exp $
EAPI=5
@@ -20,8 +20,8 @@ SLOT="0"
KEYWORDS=""
IUSE="cairo debug examples graphicsmagick hunspell +minimal osg +pdf poppler scripts templates tk"
-# a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a}
-IUSE_LINGUAS=" af ar bg br ca cs_CZ cy da_DK de de_1901 de_CH el en_AU en_GB en_US es_ES et eu fi fr gl hu id it ja ko lt_LT nb_NO nl pl_PL pt pt_BR ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW"
+#a=$((ls resources/translations/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'| awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_: :g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e 's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a
+IUSE_LINGUAS=" af ar bg br ca ca_ES cs cs_CZ cy cy_GB da da_DK de de_1901 de_CH de_DE el en_AU en_EN en_GB en_US eo es es_ES et eu fi fi_FI fr gl he hr hu hu_HU ia id id_ID is is_IS it ja ko ku la lt lt_LT nb_NO nl nn_NO pl pl_PL pt pt_BR pt_PT ro ro_RO ru ru_RU_0 sa sk sk_SK sl sl_SI sq sr sv sv_SE th_TH tr uk uk_UA zh_CN zh_TW"
IUSE+=" ${IUSE_LINGUAS// / linguas_}"
REQUIRED_USE="
@@ -107,9 +107,16 @@ src_configure() {
local lang langs
for lang in ${IUSE_LINGUAS}; do
if use linguas_${lang}; then
- langs+=",${lang}"
+ # From the CMakeLists.txt
+ # "#Bit of a hack, preprocess all the filenames to generate our language string, needed for -DWANT_GUI_LANG=en_GB,de_DE , etc"
+ langs+=";${lang}"
else
+ # Don't install localized documentation
sed -e "/${lang}/d" -i doc/CMakeLists.txt || die
+ safe_delete file ./resources/dicts/README_${lang}.txt
+ safe_delete file ./resources/dicts/README_hyph_${lang}.txt
+ safe_delete file ./resources/dicts/hyph_${lang}.dic
+ safe_delete file ./resources/loremipsum/${lang}.xml
fi
done
@@ -121,7 +128,7 @@ src_configure() {
-DWANT_QTARTHUR=ON
-DWANT_QT3SUPPORT=OFF
-DGENTOOVERSION=${PVR}
- -DWANT_GUI_LANG=${langs#,}
+ -DWANT_GUI_LANG=${langs#;}
$(cmake-utils_use_with pdf PODOFO)
$(cmake-utils_use_want cairo)
$(cmake-utils_use_want graphicsmagick)
@@ -138,11 +145,10 @@ src_configure() {
src_install() {
cmake-utils_src_install
- local lang file
+ local lang
for lang in ${IUSE_LINGUAS}; do
- file="${ED}"/usr/share/scribus/translations/scribus.${lang}.qm
- if ! use linguas_${lang} && [[ -f "${file}" ]]; then
- rm "${file}" || die
+ if ! use linguas_${lang}; then
+ safe_delete dir "${ED}"/usr/share/man/${lang}
fi
done
@@ -152,8 +158,9 @@ src_install() {
rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
fi
- use scripts && python_fix_shebang "${ED}"/usr/share/scribus/scripts
- use scripts && python_optimize "${ED}"/usr/share/scribus/scripts
+ use scripts && \
+ python_fix_shebang "${ED}"/usr/share/scribus/scripts && \
+ python_optimize "${ED}"/usr/share/scribus/scripts
mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
@@ -171,3 +178,20 @@ pkg_postrm() {
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
}
+
+safe_delete () {
+ case $1 in
+ dir)
+ if [[ -d "${2}" ]]; then
+ rm -r "${2}" || die
+ fi
+ ;;
+ file)
+ if [[ -f "${2}" ]]; then
+ rm "${2}" || die
+ fi
+ ;;
+ *)
+ die "Wrong usage"
+ esac
+}
diff --git a/app-text/pdf2djvu/Manifest b/app-text/pdf2djvu/Manifest
index 12b9dcec6262..c22f7f01c8e3 100644
--- a/app-text/pdf2djvu/Manifest
+++ b/app-text/pdf2djvu/Manifest
@@ -1,3 +1 @@
DIST pdf2djvu-0.7.19.tar.xz 227248 SHA256 c783cea31bf4016dbf85e242a2ebcb54fe70a41bcb046e1dd0cb502a7f5f003c SHA512 7e7ab8e92eb2f57dc678771333bb6c9f88ad460585cc8b886ae10f9c120833b3d95587f94c86ab1b152d6836d5531f64d031af33d95fc96f8219cd611cfe300f WHIRLPOOL 8434cd0ab7901176b3833ddabe7ed3eed8f5b4227afeff72b10e501009a02a6e67ad83d7ae261577945e3c97c5eb61ad36ff805891d94cfd27c517e5a916b2a7
-DIST pdf2djvu_0.7.16.tar.gz 320802 SHA256 dbda2086d0f164d0da6e785f8ffd6f252bf805ce7930127d42aab9dbf1bde4f9 SHA512 ccd4b11137b730226f42382669517a2cd8eed235fb50ef67e0958194e5a290282a450f5118c6117f1f77a099c79c4755bf8e5ebf1dbf9743ac74cf78d830c538 WHIRLPOOL 8d7b28f7df5135cd97cf458adf0979daa177fc2d0e3e41eb20698dceb92ddb41c4fc0282d0d0423dae68402d7cfa354df4c7dd8e77cbf93567d4889158dc80e5
-DIST pdf2djvu_0.7.17.tar.gz 320923 SHA256 fe6d6e2d6df53195f082890d3cb5e50080784510691e708a5e4614b49662f4da SHA512 ba4071fb6cb9ae8d5d5a226a4ab23a3298fae137d03cc675057e5451e79a2ddf517441611481098df07468f0258894ef6a14705793bfeaa56aec2aea9b32827a WHIRLPOOL f54e78f58755493aa3a953043ef7538da68a5d0e8838a31a81a020dd3e5b0ef81eb8abcaa56ba1e7135996dd95cdad529e2d3c72c6a1c26ae8356eb62d028b2e
diff --git a/app-text/pdf2djvu/pdf2djvu-0.7.16.ebuild b/app-text/pdf2djvu/pdf2djvu-0.7.16.ebuild
deleted file mode 100644
index 3022b5db33e5..000000000000
--- a/app-text/pdf2djvu/pdf2djvu-0.7.16.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdf2djvu/pdf2djvu-0.7.16.ebuild,v 1.3 2015/02/22 22:23:43 dilfridge Exp $
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="A tool to create DjVu files from PDF files"
-HOMEPAGE="http://code.google.com/p/pdf2djvu/"
-SRC_URI="http://pdf2djvu.googlecode.com/files/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+graphicsmagick nls openmp test"
-
-RDEPEND="
- >=app-text/djvu-3.5.21:=
- =app-text/djvu-3.5.21:=
- =media-libs/fontconfig-2.6.0
- >=media-libs/freetype-2.3.9
- sys-libs/zlib
- cairo? (
- dev-libs/glib:2
- >=x11-libs/cairo-1.10.0
- introspection? ( >=dev-libs/gobject-introspection-1.32.1 )
- )
- curl? ( net-misc/curl )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/openjpeg:0 )
- lcms? ( media-libs/lcms:2 )
- png? ( media-libs/libpng:0= )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
- cjk? ( >=app-text/poppler-data-0.4.4 )
-"
-
-DOCS=(AUTHORS NEWS README README-XPDF TODO)
-
-src_configure() {
- # this is needed for multilib, see bug 459394
- local ft_libdir ft_includedir
- ft_libdir="$($(tc-getPKG_CONFIG) freetype2 --variable=libdir)"
- ft_includedir="$($(tc-getPKG_CONFIG) freetype2 --variable=includedir)"
- export FREETYPE_DIR="${ft_libdir}:${ft_includedir%/include}"
- einfo "Detected FreeType at ${FREETYPE_DIR}"
-
- mycmakeargs=(
- -DBUILD_GTK_TESTS=OFF
- -DBUILD_QT4_TESTS=OFF
- -DBUILD_QT5_TESTS=OFF
- -DBUILD_CPP_TESTS=OFF
- -DENABLE_SPLASH=ON
- -DENABLE_ZLIB=ON
- -DENABLE_XPDF_HEADERS=ON
- $(cmake-utils_use_enable curl LIBCURL)
- $(cmake-utils_use_enable cxx CPP)
- $(cmake-utils_use_enable jpeg2k LIBOPENJPEG)
- $(cmake-utils_use_enable utils)
- $(cmake-utils_use_with cairo)
- $(cmake-utils_use_with introspection GObjectIntrospection)
- $(cmake-utils_use_with jpeg)
- $(cmake-utils_use_with png)
- $(cmake-utils_use_with qt4)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Core=ON
- $(cmake-utils_use_with tiff)
- )
- if use lcms; then
- mycmakeargs+=(-DENABLE_CMS=lcms2)
- else
- mycmakeargs+=(-DENABLE_CMS=)
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use cairo && use doc; then
- # For now install gtk-doc there
- insinto /usr/share/gtk-doc/html/poppler
- doins -r "${S}"/glib/reference/html/*
- fi
-}
diff --git a/app-text/poppler/poppler-0.26.5.ebuild b/app-text/poppler/poppler-0.33.0.ebuild
similarity index 70%
rename from app-text/poppler/poppler-0.26.5.ebuild
rename to app-text/poppler/poppler-0.33.0.ebuild
index f1eb40c9b2a2..f5fb844f31bb 100644
--- a/app-text/poppler/poppler-0.26.5.ebuild
+++ b/app-text/poppler/poppler-0.33.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.26.5.ebuild,v 1.7 2015/03/02 09:33:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.33.0.ebuild,v 1.1 2015/05/18 11:31:55 dilfridge Exp $
EAPI=5
@@ -9,12 +9,11 @@ inherit cmake-utils toolchain-funcs
if [[ "${PV}" == "9999" ]] ; then
inherit git-r3
EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
- KEYWORDS=""
SLOT="0/9999"
else
SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
- KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
- SLOT="0/46"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ SLOT="0/52" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
fi
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -60,7 +59,11 @@ RDEPEND="${COMMON_DEPEND}
DOCS=(AUTHORS NEWS README README-XPDF TODO)
-PATCHES=( "${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch"
+ "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+ "${FILESDIR}/${PN}-0.28.1-respect-cflags.patch"
+)
src_configure() {
local mycmakeargs=(
@@ -73,7 +76,6 @@ src_configure() {
-DENABLE_XPDF_HEADERS=ON
$(cmake-utils_use_enable curl LIBCURL)
$(cmake-utils_use_enable cxx CPP)
- $(cmake-utils_use_enable jpeg2k LIBOPENJPEG)
$(cmake-utils_use_enable utils)
$(cmake-utils_use_with cairo)
$(cmake-utils_use_with introspection GObjectIntrospection)
@@ -83,6 +85,11 @@ src_configure() {
$(cmake-utils_use_find_package qt5 Qt5Core)
$(cmake-utils_use_with tiff)
)
+ if use jpeg2k; then
+ mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg1)
+ else
+ mycmakeargs+=(-DENABLE_LIBOPENJPEG=)
+ fi
if use lcms; then
mycmakeargs+=(-DENABLE_CMS=lcms2)
else
@@ -98,6 +105,7 @@ src_install() {
if use cairo && use doc; then
# For now install gtk-doc there
insinto /usr/share/gtk-doc/html/poppler
- doins -r "${S}"/glib/reference/html/*
+ # nonfatal, because live version doesn't provide html documentation.
+ nonfatal doins -r "${S}"/glib/reference/html/*
fi
}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index b291709ca1f9..07b39e6bc66d 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-9999.ebuild,v 1.5 2015/03/20 15:18:23 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-9999.ebuild,v 1.6 2015/05/18 11:31:55 dilfridge Exp $
EAPI=5
@@ -9,12 +9,11 @@ inherit cmake-utils toolchain-funcs
if [[ "${PV}" == "9999" ]] ; then
inherit git-r3
EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
- KEYWORDS=""
SLOT="0/9999"
else
SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
- SLOT="0/47" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+ SLOT="0/52" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
fi
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -62,7 +61,9 @@ DOCS=(AUTHORS NEWS README README-XPDF TODO)
PATCHES=(
"${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch"
- "${FILESDIR}/${PN}-0.28.1-respect-cflags.patch" )
+ "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+ "${FILESDIR}/${PN}-0.28.1-respect-cflags.patch"
+)
src_configure() {
local mycmakeargs=(
diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest
index d6af9967486b..fd01d7b8bdab 100644
--- a/dev-db/mariadb-galera/Manifest
+++ b/dev-db/mariadb-galera/Manifest
@@ -1,3 +1,2 @@
-DIST mariadb-galera-10.0.16.tar.gz 55886236 SHA256 c730c6dbeee4e2985a8db9dc15a6b6e8e64db14cef1442ee5f6732d2754ed9fb SHA512 2a3fcb79bd32420b4b69118825ed4c954fcf7d1fd2358159687bc90157aef9e440d24209ffa71887029b66adca14f439f08d3edfdcee431b9d8bc49a9c7e6762 WHIRLPOOL 60c27680e8ba91f174cb9827e9def0760e8e388f4f072e9d8b71b102a57f2e141dc6cdd66604ad802512ad24855af9216ab4d87718f30c1ff599b3222b44d31c
-DIST mariadb-galera-10.0.17.tar.gz 56229230 SHA256 6ee9595630c0ddd498afe086953cbf7430aec48fe429230f8615627881897c6d SHA512 ee9e437d03b62f8416847ceb2843bb40110aa904ce4c8ae53e4fff95ae60871859128436a644e995ba1f62271c9c0f42efccda095747a9658e811367670ec2b6 WHIRLPOOL fe08438e96b87dc569d3b790147ee11c0af0394f56fdeb31230db3ed6d8dd1b58ad6e145fd636bd1574060b99b3736cf14a8a886980ef054d8f6e6a331c6c7cd
+DIST mariadb-galera-10.0.19.tar.gz 56520261 SHA256 df5c0e8ff2db0dbf2490c52f5d9b509216e2d89bf6d340920aad2b41d4d1ae75 SHA512 9acba0d851c8bdfe0b28e3ec3dc9a21a41c8f283322d73a3c05ac10b9e9400302b9e6fe47d0d5ef73307254af715bc3ed144acaa325ce6c78841ddd14ee754c7 WHIRLPOOL 2c60ee6a82e8f6effed3b376a7647f0bc804de633d770bb215f37774bd7cd1f38b0ef173b68ec3f3eab9f59ffee77cb05668159873a5ebd863d0d96735f39edb
DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512 7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed WHIRLPOOL 99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.16.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.16.ebuild
deleted file mode 100644
index 0d6812f4faf0..000000000000
--- a/dev-db/mariadb-galera/mariadb-galera-10.0.16.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/mariadb-galera-10.0.16.ebuild,v 1.1 2015/02/06 14:07:36 grknight Exp $
-
-EAPI="5"
-MY_EXTRAS_VER="20141215-0144Z"
-WSREP_REVISION="25"
-
-inherit toolchain-funcs mysql-multilib
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~amd64 ~x86"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='-cluster embedded extraengine perl ssl static-libs community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-galera-X.X.XX.ebuild \
-# digest clean package
-multilib_src_test() {
-
- if ! multilib_is_native_abi ; then
- einfo "Server tests not available on non-native abi".
- return 0;
- fi
-
- local TESTDIR="${BUILD_DIR}/mysql-test"
- local retstatus_unit
- local retstatus_tests
-
- # Bug #213475 - MySQL _will_ object strenously if your machine is named
- # localhost. Also causes weird failures.
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
- if ! use "minimal" ; then
-
- if [[ $UID -eq 0 ]]; then
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
- fi
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Run CTest (test-units)
- cmake-utils_src_test
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
- # You may set this by hand.
- # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
- export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
- # create directories because mysqladmin might right out of order
- mkdir -p "${T}"/var-tests{,/log}
-
- # These are failing in MariaDB 10.0 for now and are believed to be
- # false positives:
- #
- # main.information_schema, binlog.binlog_statement_insert_delayed,
- # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
- # funcs_1.is_columns_mysql
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test, main.mysql_client_test_nonblock
- # mina.mysql_client_test_comp:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # wsrep.variables:
- # Expects the sys-cluster/galera library to be installed and configured
- #
- # wsrep.foreign_key:
- # Issues a configuration deprecation warning which does not affect data
- #
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- main.mysql_client_test_comp \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help wsrep.variables wsrep.foreign_key \
- funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
- mysql-multilib_disable_test "$t" "False positives in Gentoo"
- done
-
- for t in rpl.rpl_heartbeat_ssl rpl.rpl_ssl rpl.rpl_ssl1 main.ssl_cipher \
- main.ssl_8k_key main.openssl_6975 main.openssl_1 main.ssl main.ssl_compress \
- main.ssl_connect; do
- mysql-multilib_disable_test "$t" "Disabled due to expired certificate"
- done
-
- for t in wsrep.binlog_format wsrep.pool_of_threads wsrep.mdev_6832 ; do
- mysql-multilib_disable_test "$t" "Skipped for MDEV-7544"
- done
-
- # Run mysql tests
- pushd "${TESTDIR}"
-
- # run mysql-test tests
- # The PATH addition is required for the galera suite to find the sst scripts
- # Skipping galera tests for now until MDEV-7544 is resovled
- WSREP_LOG_DIR="${T}/var-tests/wsrep" \
- PATH="${BUILD_DIR}/scripts:${PATH}" \
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --skip-test=galera
- retstatus_tests=$?
- [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- popd
-
- # Cleanup is important for these testcases.
- pkill -9 -f "${S}/ndb" 2>/dev/null
- pkill -9 -f "${S}/sql" 2>/dev/null
-
- failures=""
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- [[ -z "$failures" ]] || die "Test failures: $failures"
- einfo "Tests successfully completed"
- else
-
- einfo "Skipping server tests due to minimal build."
- fi
-}
diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.17.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.19.ebuild
similarity index 96%
rename from dev-db/mariadb-galera/mariadb-galera-10.0.17.ebuild
rename to dev-db/mariadb-galera/mariadb-galera-10.0.19.ebuild
index f5bba52d425e..3b972ef7ae82 100644
--- a/dev-db/mariadb-galera/mariadb-galera-10.0.17.ebuild
+++ b/dev-db/mariadb-galera/mariadb-galera-10.0.19.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/mariadb-galera-10.0.17.ebuild,v 1.1 2015/04/03 12:34:23 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/mariadb-galera-10.0.19.ebuild,v 1.1 2015/05/18 20:07:51 grknight Exp $
EAPI="5"
MY_EXTRAS_VER="20141215-0144Z"
@@ -73,7 +73,7 @@ multilib_src_test() {
#
# main.information_schema, binlog.binlog_statement_insert_delayed,
# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
- # funcs_1.is_columns_mysql
+ # funcs_1.is_columns_mysql, main.bootstrap
# fails due to USE=-latin1 / utf8 default
#
# main.mysql_client_test, main.mysql_client_test_nonblock
@@ -88,7 +88,7 @@ multilib_src_test() {
#
for t in main.mysql_client_test main.mysql_client_test_nonblock \
- main.mysql_client_test_comp \
+ main.mysql_client_test_comp main.bootstrap \
binlog.binlog_statement_insert_delayed main.information_schema \
main.mysqld--help wsrep.variables wsrep.foreign_key \
funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
diff --git a/dev-go/go-crypto/Manifest b/dev-go/go-crypto/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/dev-go/go-crypto/go-crypto-9999.ebuild b/dev-go/go-crypto/go-crypto-9999.ebuild
new file mode 100644
index 000000000000..1ce635086f5e
--- /dev/null
+++ b/dev-go/go-crypto/go-crypto-9999.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-crypto/go-crypto-9999.ebuild,v 1.1 2015/05/19 05:21:21 zmedico Exp $
+
+EAPI=5
+inherit git-r3
+
+KEYWORDS=""
+DESCRIPTION="Go supplementary cryptography libraries"
+GO_PN=golang.org/x/${PN##*-}
+HOMEPAGE="https://godoc.org/${GO_PN}"
+EGIT_REPO_URI="https://go.googlesource.com/${PN##*-}"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+DEPEND=">=dev-lang/go-1.4"
+RDEPEND=""
+S="${WORKDIR}/src/${GO_PN}"
+EGIT_CHECKOUT_DIR="${S}"
+STRIP_MASK="*.a"
+
+src_compile() {
+ # Create a writable GOROOT in order to avoid sandbox violations.
+ GOROOT="${WORKDIR}/goroot"
+ cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
+ rm -rf "${GOROOT}/src/${GO_PN%/*}" \
+ "${GOROOT}/pkg/linux_${ARCH}/${GO_PN%/*}" || die
+ GOROOT="${GOROOT}" GOPATH=${WORKDIR} go install -v -x -work ${GO_PN}/... || die
+}
+
+src_install() {
+ insinto /usr/lib/go
+ find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
+ doins -r "${WORKDIR}"/{pkg,src}
+}
diff --git a/dev-go/go-crypto/metadata.xml b/dev-go/go-crypto/metadata.xml
new file mode 100644
index 000000000000..059d713e41ed
--- /dev/null
+++ b/dev-go/go-crypto/metadata.xml
@@ -0,0 +1,7 @@
+
+
+
+
+ zmedico@gentoo.org
+
+
diff --git a/dev-java/antlr/antlr-2.7.7-r5.ebuild b/dev-java/antlr/antlr-2.7.7-r5.ebuild
index fe23a9c84a80..2f355972b651 100644
--- a/dev-java/antlr/antlr-2.7.7-r5.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r5.ebuild,v 1.13 2015/05/17 20:02:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r5.ebuild,v 1.14 2015/05/18 13:15:33 ago Exp $
EAPI="5"
@@ -18,7 +18,7 @@ SRC_URI="http://www.antlr2.org/download/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc debug examples mono +cxx +java python script source static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-java/antlr/antlr-4.4.ebuild b/dev-java/antlr/antlr-4.4.ebuild
index 5b3305c84e9c..267838c0db78 100644
--- a/dev-java/antlr/antlr-4.4.ebuild
+++ b/dev-java/antlr/antlr-4.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-4.4.ebuild,v 1.4 2015/05/17 20:08:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-4.4.ebuild,v 1.5 2015/05/18 13:15:42 ago Exp $
EAPI="5"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.antlr.org/"
SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.zip"
LICENSE="BSD"
SLOT="4"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ppc64 ~x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ppc64 ~x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="gunit"
CDEPEND="
diff --git a/dev-java/colt/colt-1.2.0-r2.ebuild b/dev-java/colt/colt-1.2.0-r2.ebuild
index 88cb4bcc94d3..ff4fdf3fc6d3 100644
--- a/dev-java/colt/colt-1.2.0-r2.ebuild
+++ b/dev-java/colt/colt-1.2.0-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/colt/colt-1.2.0-r2.ebuild,v 1.3 2015/05/17 20:01:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/colt/colt-1.2.0-r2.ebuild,v 1.4 2015/05/18 13:15:47 ago Exp $
EAPI=5
@@ -15,7 +15,7 @@ HOMEPAGE="http://www-itg.lbl.gov/~hoschek/colt/"
LICENSE="colt"
IUSE=""
SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 ~x86"
DEPEND=">=virtual/jdk-1.4
>=dev-java/concurrent-util-1.3.4:0"
diff --git a/dev-java/commons-io/Manifest b/dev-java/commons-io/Manifest
index ac101c18cde2..faeff6ca9739 100644
--- a/dev-java/commons-io/Manifest
+++ b/dev-java/commons-io/Manifest
@@ -1,3 +1,2 @@
-DIST commons-io-1.4-src.tar.gz 236187 SHA256 eca986497f7b4d1b1ec41821b1b5df827bb31fc14833e4449cfa8bcd5d7f29bb SHA512 75395b5aeec6c04e6063b00161c3743dad6362f6a4095e26ba099aae8d187228d597fe91901afd395d06da390c4c19ceb60c73c49f83cbe45321b401a340f7c3 WHIRLPOOL 77d10b87b3be3006ead4fcb7ea9a72094ad35ea54951a5b0091b64f4e0bf82c75be36ae630cb90be82c444bb145e2f671268c187c6cb66cd82bfa8f9b8292e74
DIST commons-io-2.0.1-src.tar.gz 280920 SHA256 32be3e626618b49c2e2fb268bd2101d7ae38438131df4560fc800bd2f26fdff8 SHA512 0e01d12c46707ff254b8aa3b31fe8d027e7bafd34a2c2c96b8867084bbe43c763d03f773189ec17ffc6525ad8d022009cb64cdf288a401194e8c0ebbe5d99ee2 WHIRLPOOL 4e34102bdf9b025165f25d09287ce446f838a92c990db099f5a9356cad994b88b9916c089f2ffcb7ceeeb5250b22daace637b7df5a3526711923824d0dc3f8f1
DIST commons-io-2.4-src.tar.gz 330961 SHA256 961c8b41a891933c2d662d8e490667243ac82422668d1ccdd7bfedfdb944bb58 SHA512 69ac5f7b8de952d8b519ad89d4e9a33a9d269af0e68b735c0180ee8853a30e2a09147ceac362626a2fb3a041bd46eca094be2661ff280c1bab54a0548cae0aee WHIRLPOOL 4db6be6dbba4e3c9f67c471eff709ade22594ef1cea759da5651fa5788b1bcfeca689621eb3ff7ca52dca0229b096d597e9f5cb969ebcc7a06ff18f28ccc3551
diff --git a/dev-java/commons-io/commons-io-1.4.ebuild b/dev-java/commons-io/commons-io-1.4.ebuild
deleted file mode 100644
index 2a177c9b55a4..000000000000
--- a/dev-java/commons-io/commons-io-1.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-io/commons-io-1.4.ebuild,v 1.11 2014/08/10 20:11:05 slyfox Exp $
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_P="${P}-src"
-DESCRIPTION="Commons-IO contains utility classes, stream implementations, file filters, and endian classes"
-HOMEPAGE="http://commons.apache.org/io/"
-SRC_URI="mirror://apache/commons/io/source/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="test"
-
-DEPEND=">=virtual/jdk-1.4
- test? ( dev-java/ant-junit )"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- java-ant_ignore-system-classes
- java-ant_rewrite-classpath
- # Setting java.io.tmpdir doesn't have effect unless we do this because the
- # vm is forked
- java-ant_xml-rewrite -f build.xml --change -e junit -a clonevm -v "true"
-}
-
-EANT_EXTRA_ARGS="-Duser.home=${T}"
-
-src_test() {
- if [[ ${EUID} -ne 0 ]]; then
- ANT_OPTS="-Djava.io.tmpdir=${T} -Duser.home=${T}" \
- ANT_TASKS="ant-junit" \
- eant test \
- -Dgentoo.classpath="$(java-pkg_getjars junit)" \
- -Dlibdir="libdir" \
- -Djava.io.tmpdir="${T}"
- else
- elog "Tests fail unless userpriv is enabled because they test for"
- elog "file permissions which doesn't work when run as root."
- fi
-}
-
-src_install() {
- java-pkg_newjar target/${P}.jar ${PN}.jar
-
- dodoc RELEASE-NOTES.txt NOTICE.txt || die
- use doc && java-pkg_dojavadoc target/apidocs
- use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/commons-io/commons-io-2.4.ebuild b/dev-java/commons-io/commons-io-2.4.ebuild
index ebe3df82fec5..ad2ceb0e7f0c 100644
--- a/dev-java/commons-io/commons-io-2.4.ebuild
+++ b/dev-java/commons-io/commons-io-2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-io/commons-io-2.4.ebuild,v 1.2 2014/08/10 20:11:05 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-io/commons-io-2.4.ebuild,v 1.3 2015/05/18 13:42:01 monsieurp Exp $
EAPI=5
JAVA_PKG_IUSE="doc source"
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/commons/io/source/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="test"
RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/glassfish-interceptor-api/glassfish-interceptor-api-3.1.ebuild b/dev-java/glassfish-interceptor-api/glassfish-interceptor-api-3.1.ebuild
index edafeca5ca6f..8d616998d657 100644
--- a/dev-java/glassfish-interceptor-api/glassfish-interceptor-api-3.1.ebuild
+++ b/dev-java/glassfish-interceptor-api/glassfish-interceptor-api-3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/glassfish-interceptor-api/glassfish-interceptor-api-3.1.ebuild,v 1.3 2015/04/02 18:08:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/glassfish-interceptor-api/glassfish-interceptor-api-3.1.ebuild,v 1.4 2015/05/18 13:15:37 ago Exp $
EAPI="5"
@@ -16,7 +16,7 @@ SRC_URI="http://dev.gentoo.org/~tomwij/files/dist/${P}.tar.xz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
CDEPEND=""
diff --git a/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild b/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
index 0209eae23e6c..e9e90e79435b 100644
--- a/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild,v 1.6 2015/05/17 20:03:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild,v 1.7 2015/05/18 13:15:52 ago Exp $
EAPI="5"
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
python_prepare_all() {
diff --git a/dev-java/javax-inject/javax-inject-1-r1.ebuild b/dev-java/javax-inject/javax-inject-1-r1.ebuild
index 79fa15bd1f2e..e63a88aa9a3a 100644
--- a/dev-java/javax-inject/javax-inject-1-r1.ebuild
+++ b/dev-java/javax-inject/javax-inject-1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javax-inject/javax-inject-1-r1.ebuild,v 1.2 2013/05/30 08:59:38 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javax-inject/javax-inject-1-r1.ebuild,v 1.3 2015/05/18 13:15:27 ago Exp $
EAPI="5"
@@ -16,7 +16,7 @@ SRC_URI="http://atinject.googlecode.com/files/${MY_P}-bundle.jar"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
DEPEND=">=virtual/jdk-1.5
app-arch/unzip"
diff --git a/dev-java/jsoup/jsoup-1.8.1.ebuild b/dev-java/jsoup/jsoup-1.8.1.ebuild
index a50f4d7c5323..0541b5cb9efb 100644
--- a/dev-java/jsoup/jsoup-1.8.1.ebuild
+++ b/dev-java/jsoup/jsoup-1.8.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jsoup/jsoup-1.8.1.ebuild,v 1.1 2014/12/14 10:16:13 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsoup/jsoup-1.8.1.ebuild,v 1.2 2015/05/18 13:15:22 ago Exp $
EAPI="5"
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/jhy/${PN}/archive/${PN}-${MY_PV}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE=""
diff --git a/dev-java/slf4j-api/slf4j-api-1.7.7.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.7.ebuild
index 4161105cdf05..bb66630215ee 100644
--- a/dev-java/slf4j-api/slf4j-api-1.7.7.ebuild
+++ b/dev-java/slf4j-api/slf4j-api-1.7.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/slf4j-api/slf4j-api-1.7.7.ebuild,v 1.2 2015/05/13 14:18:58 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/slf4j-api/slf4j-api-1.7.7.ebuild,v 1.3 2015/05/18 13:15:17 ago Exp $
EAPI=5
JAVA_PKG_IUSE="doc source"
@@ -13,7 +13,7 @@ SRC_URI="http://www.slf4j.org/dist/${P/-api/}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
IUSE="test"
RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/scala-bin/Manifest b/dev-lang/scala-bin/Manifest
similarity index 100%
rename from dev-java/scala-bin/Manifest
rename to dev-lang/scala-bin/Manifest
diff --git a/dev-java/scala-bin/metadata.xml b/dev-lang/scala-bin/metadata.xml
similarity index 69%
rename from dev-java/scala-bin/metadata.xml
rename to dev-lang/scala-bin/metadata.xml
index 250f2d1940ea..68b30527c024 100644
--- a/dev-java/scala-bin/metadata.xml
+++ b/dev-lang/scala-bin/metadata.xml
@@ -2,4 +2,7 @@
java
+
+ monsieurp@gentoo.org
+
diff --git a/dev-java/scala-bin/scala-bin-2.11.4.ebuild b/dev-lang/scala-bin/scala-bin-2.11.4.ebuild
similarity index 93%
rename from dev-java/scala-bin/scala-bin-2.11.4.ebuild
rename to dev-lang/scala-bin/scala-bin-2.11.4.ebuild
index fdf98bdbaebd..d9b5cb6b1ad5 100644
--- a/dev-java/scala-bin/scala-bin-2.11.4.ebuild
+++ b/dev-lang/scala-bin/scala-bin-2.11.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/scala-bin/scala-bin-2.11.4.ebuild,v 1.7 2015/03/25 13:54:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala-bin/scala-bin-2.11.4.ebuild,v 1.2 2015/05/18 21:11:24 monsieurp Exp $
EAPI=5
diff --git a/dev-java/scala-bin/scala-bin-2.11.5.ebuild b/dev-lang/scala-bin/scala-bin-2.11.5.ebuild
similarity index 93%
rename from dev-java/scala-bin/scala-bin-2.11.5.ebuild
rename to dev-lang/scala-bin/scala-bin-2.11.5.ebuild
index 1a70d138ade7..f2dfc237f675 100644
--- a/dev-java/scala-bin/scala-bin-2.11.5.ebuild
+++ b/dev-lang/scala-bin/scala-bin-2.11.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/scala-bin/scala-bin-2.11.5.ebuild,v 1.4 2015/03/24 09:33:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala-bin/scala-bin-2.11.5.ebuild,v 1.1 2015/05/18 21:07:03 monsieurp Exp $
EAPI=5
diff --git a/dev-java/scala-bin/scala-bin-2.11.6.ebuild b/dev-lang/scala-bin/scala-bin-2.11.6.ebuild
similarity index 93%
rename from dev-java/scala-bin/scala-bin-2.11.6.ebuild
rename to dev-lang/scala-bin/scala-bin-2.11.6.ebuild
index 8d3a3aca6dec..dc36312eaa9a 100644
--- a/dev-java/scala-bin/scala-bin-2.11.6.ebuild
+++ b/dev-lang/scala-bin/scala-bin-2.11.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/scala-bin/scala-bin-2.11.6.ebuild,v 1.2 2015/03/24 09:33:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala-bin/scala-bin-2.11.6.ebuild,v 1.1 2015/05/18 21:07:03 monsieurp Exp $
EAPI=5
diff --git a/dev-lang/scala/scala-2.10.2-r2.ebuild b/dev-lang/scala/scala-2.10.2-r2.ebuild
index b50c8c5c2a35..39e1b16996bc 100644
--- a/dev-lang/scala/scala-2.10.2-r2.ebuild
+++ b/dev-lang/scala/scala-2.10.2-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.10.2-r2.ebuild,v 1.2 2015/04/18 07:42:09 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.10.2-r2.ebuild,v 1.3 2015/05/18 21:15:40 monsieurp Exp $
EAPI="5"
@@ -83,7 +83,7 @@ DEPEND="${COMMON_DEP}
RDEPEND="${COMMON_DEP}
>=virtual/jre-1.7
app-eselect/eselect-scala
- !dev-java/scala-bin:0"
+ !dev-lang/scala-bin:0"
PDEPEND="emacs? ( app-emacs/scala-mode:0 )"
diff --git a/dev-lang/scala/scala-2.10.3-r1.ebuild b/dev-lang/scala/scala-2.10.3-r1.ebuild
index 176f718e1b66..e6e754a596ff 100644
--- a/dev-lang/scala/scala-2.10.3-r1.ebuild
+++ b/dev-lang/scala/scala-2.10.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.10.3-r1.ebuild,v 1.2 2015/04/18 07:42:09 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.10.3-r1.ebuild,v 1.3 2015/05/18 21:15:40 monsieurp Exp $
EAPI="5"
@@ -96,7 +96,7 @@ DEPEND="${COMMON_DEP}
RDEPEND="${COMMON_DEP}
>=virtual/jre-1.6
app-eselect/eselect-scala
- !dev-java/scala-bin:0"
+ !dev-lang/scala-bin:0"
PDEPEND="emacs? ( app-emacs/scala-mode:0 )"
diff --git a/dev-lang/scala/scala-2.10.4-r1.ebuild b/dev-lang/scala/scala-2.10.4-r1.ebuild
index 13d502e52af9..77d85e3d2464 100644
--- a/dev-lang/scala/scala-2.10.4-r1.ebuild
+++ b/dev-lang/scala/scala-2.10.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.10.4-r1.ebuild,v 1.2 2015/04/18 07:42:09 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.10.4-r1.ebuild,v 1.3 2015/05/18 21:15:40 monsieurp Exp $
EAPI="5"
@@ -99,7 +99,7 @@ DEPEND="${COMMON_DEP}
RDEPEND="${COMMON_DEP}
>=virtual/jre-1.6
app-eselect/eselect-scala
- !dev-java/scala-bin:0"
+ !dev-lang/scala-bin:0"
PDEPEND="emacs? ( app-emacs/scala-mode:0 )"
diff --git a/dev-lang/scala/scala-2.11.1-r1.ebuild b/dev-lang/scala/scala-2.11.1-r1.ebuild
index 3cc6dfb9a156..b52d0bfa7933 100644
--- a/dev-lang/scala/scala-2.11.1-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.11.1-r1.ebuild,v 1.2 2015/04/18 07:42:09 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.11.1-r1.ebuild,v 1.3 2015/05/18 21:15:40 monsieurp Exp $
EAPI="5"
@@ -89,7 +89,7 @@ DEPEND="${COMMON_DEP}
RDEPEND="${COMMON_DEP}
>=virtual/jre-1.6
app-eselect/eselect-scala
- !dev-java/scala-bin:0"
+ !dev-lang/scala-bin:0"
PDEPEND="emacs? ( app-emacs/scala-mode:0 )"
diff --git a/dev-lang/scala/scala-2.11.2-r1.ebuild b/dev-lang/scala/scala-2.11.2-r1.ebuild
index 60cd316b153c..d0581fc44176 100644
--- a/dev-lang/scala/scala-2.11.2-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.11.2-r1.ebuild,v 1.2 2015/04/18 07:42:09 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.11.2-r1.ebuild,v 1.3 2015/05/18 21:15:40 monsieurp Exp $
EAPI="5"
@@ -89,7 +89,7 @@ DEPEND="${COMMON_DEP}
RDEPEND="${COMMON_DEP}
>=virtual/jre-1.6
app-eselect/eselect-scala
- !dev-java/scala-bin:0"
+ !dev-lang/scala-bin:0"
PDEPEND="emacs? ( app-emacs/scala-mode:0 )"
diff --git a/dev-lang/scala/scala-2.11.4-r1.ebuild b/dev-lang/scala/scala-2.11.4-r1.ebuild
index 8feb57b4692f..6e7e24eb4779 100644
--- a/dev-lang/scala/scala-2.11.4-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.11.4-r1.ebuild,v 1.2 2015/04/18 07:42:09 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.11.4-r1.ebuild,v 1.3 2015/05/18 21:15:40 monsieurp Exp $
EAPI="5"
@@ -89,7 +89,7 @@ DEPEND="${COMMON_DEP}
RDEPEND="${COMMON_DEP}
>=virtual/jre-1.6
app-eselect/eselect-scala
- !dev-java/scala-bin:0"
+ !dev-lang/scala-bin:0"
PDEPEND="emacs? ( app-emacs/scala-mode:0 )"
diff --git a/dev-lang/scala/scala-2.11.6.ebuild b/dev-lang/scala/scala-2.11.6.ebuild
index ee05c5ec74c5..b13decb68dad 100644
--- a/dev-lang/scala/scala-2.11.6.ebuild
+++ b/dev-lang/scala/scala-2.11.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.11.6.ebuild,v 1.2 2015/04/18 07:42:09 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.11.6.ebuild,v 1.3 2015/05/18 21:15:40 monsieurp Exp $
EAPI="5"
@@ -89,7 +89,7 @@ DEPEND="${COMMON_DEP}
RDEPEND="${COMMON_DEP}
>=virtual/jre-1.6
app-eselect/eselect-scala
- !dev-java/scala-bin:0"
+ !dev-lang/scala-bin:0"
PDEPEND="emacs? ( app-emacs/scala-mode:0 )"
diff --git a/dev-lang/scala/scala-2.9.2-r1.ebuild b/dev-lang/scala/scala-2.9.2-r1.ebuild
index 37900ba9f284..d65edfa8158e 100644
--- a/dev-lang/scala/scala-2.9.2-r1.ebuild
+++ b/dev-lang/scala/scala-2.9.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.9.2-r1.ebuild,v 1.1 2015/04/17 14:39:37 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.9.2-r1.ebuild,v 1.2 2015/05/18 21:15:40 monsieurp Exp $
EAPI="5"
JAVA_PKG_IUSE="doc examples source"
@@ -35,7 +35,7 @@ DEPEND="virtual/jdk:1.6
app-arch/xz-utils"
RDEPEND=">=virtual/jre-1.6
app-eselect/eselect-scala
- !dev-java/scala-bin"
+ !dev-lang/scala-bin"
PDEPEND="emacs? ( app-emacs/scala-mode )"
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 32a61e144992..d49d1aeeadef 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -2,3 +2,4 @@ DIST libuv-0.11.25.tar.gz 393814 SHA256 b95a3e5eca9554998b7423ee786205e52731e82e
DIST libuv-0.11.29.tar.gz 486768 SHA256 fac45e72c2df30ddc9cbdf5002fc1363281d0e433831e3d43acb1036c2cabfc6 SHA512 91439c47b3af90a71c15ffcaf296b515c2723b2a4cd329b529b6d37a4d05d12bdf6ad6bca87079d17c9b79aab02634afddbcf53c70afcc1765dcaf49b9dd28b2 WHIRLPOOL d010c5f6e3c1a4262195b50087bc3408c6df726adbcd23abc27cf64ec1da6b159049a6d4f9d46c3cebaaa333b667cefe339d4fec6b1379a38940ee7f4376ec40
DIST libuv-1.1.0.tar.gz 1010640 SHA256 e4ff513c18a6322898972b0b6ce986445bcd2c13710f4a46b10baf80b28599cf SHA512 2d801b8b12e6f9b179f62084d1c260b6443ae34523c12dbea8317ff34aa0a76f3df2ee38fb161aa6fd4092b6280a53c7ed599d04eb7ed0d250c1e60b4e584dea WHIRLPOOL 6d6b3eea2ddb54322d20125f1a0a61b8a00b1771ccb8bc0d7829229cabb3e363adc6f85b2d1ae2f506410a543c92404df9f545a57805ac278fab560d5a24de5e
DIST libuv-1.4.2.tar.gz 1017992 SHA256 b9e424f69db0d1c3035c5f871cd9d7a3f4bace0a4db3e974bdbfa0cf95f6b741 SHA512 a2ee23d957b4b2c486c01a8ca0814cb42853d3496edcf2c39228fe9259317699954bd222abbcc4e7fda81b936ecfd64be3472230b319e8caab8e4bba0c835ced WHIRLPOOL 53727ec56b274523e445b23160a6a42d8b7fdf5b298480f0819a0cd4a19d811b59d00756eec2c9d69a34d8add96ff6103b44752df06d1346a13f2c979f52cc4a
+DIST libuv-1.5.0.tar.gz 1023438 SHA256 f9c6ad4b7a2c90d93c8e09d2e739bb46d199639c4d884ba30323359521b09367 SHA512 b6f6e685e66b72a0439eda35297fe5f98db598abd83deff0e9f614ef1f52ffc36717ded5e28aa2c32054c52f396ae826651c04e958f13e409a701558d777cee6 WHIRLPOOL aea128f28d336160cb2b616cd5a6dd479504be612d7b805c6bdcee529530dfb49b9bace254df9bbfceccdaed1086589defc94888b99657709c79299a13aa47e4
diff --git a/dev-libs/libuv/libuv-1.5.0.ebuild b/dev-libs/libuv/libuv-1.5.0.ebuild
new file mode 100644
index 000000000000..359b8e0022a5
--- /dev/null
+++ b/dev-libs/libuv/libuv-1.5.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libuv/libuv-1.5.0.ebuild,v 1.1 2015/05/18 15:43:15 mgorny Exp $
+
+EAPI=5
+
+inherit autotools-utils eutils multilib multilib-minimal
+
+DESCRIPTION="Cross-platform asychronous I/O"
+HOMEPAGE="https://github.com/libuv/libuv"
+SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD BSD-2 ISC MIT"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+DEPEND="sys-devel/libtool
+ virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+ echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
+ > m4/libuv-extra-automake-flags.m4 || die
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ cc_cv_cflags__g=no
+ $(use_enable static-libs static)
+ )
+ autotools-utils_src_configure
+}
+
+multilib_src_test() {
+ mkdir "${BUILD_DIR}"/test || die
+ cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
+ default
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files
+}
diff --git a/dev-libs/tntnet/metadata.xml b/dev-libs/tntnet/metadata.xml
index 334ca27d9fa6..5a94337ca559 100644
--- a/dev-libs/tntnet/metadata.xml
+++ b/dev-libs/tntnet/metadata.xml
@@ -5,10 +5,6 @@
hd_brummy@gentoo.org
Joerg Bornkessel
-
- zzam@gentoo.org
- Matthias Schwarzott
-
media-tv